Merge branch 'maint-0.4.4'

src/feature/dirauth/dirvote.c

@@ -4679,9 +4679,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
 
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
-    tor_strdup(DIRVOTE_RECCOMEND_RELAY_PROTO);
+    tor_strdup(DIRVOTE_RECOMMEND_RELAY_PROTO);
   v3_out->recommended_client_protocols =
-    tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO);
+    tor_strdup(DIRVOTE_RECOMMEND_CLIENT_PROTO);
 
   v3_out->required_relay_protocols =
     tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO);

src/feature/dirauth/dirvote.h

@@ -238,15 +238,15 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
 /** The recommended relay protocols for this authority's votes.
  * Recommending a new protocol causes old tor versions to log a warning.
  */
-#define DIRVOTE_RECCOMEND_RELAY_PROTO \
-  "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
-  "Link=4 Microdesc=1-2 Relay=2"
+#define DIRVOTE_RECOMMEND_RELAY_PROTO \
+  "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \
+  "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2"
 /** The recommended client protocols for this authority's votes.
  * Recommending a new protocol causes old tor versions to log a warning.
  */
-#define DIRVOTE_RECCOMEND_CLIENT_PROTO \
-  "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
-  "Link=4 Microdesc=1-2 Relay=2"
+#define DIRVOTE_RECOMMEND_CLIENT_PROTO \
+  "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \
+  "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2"
 
 /** The required relay protocols for this authority's votes.
  * WARNING: Requiring a new protocol causes old tor versions to shut down.

src/test/test_protover.c

@@ -680,8 +680,8 @@ test_protover_vote_roundtrip_ours(void *args)
   (void) args;
   const char *examples[] = {
     protover_get_supported_protocols(),
-    DIRVOTE_RECCOMEND_RELAY_PROTO,
-    DIRVOTE_RECCOMEND_CLIENT_PROTO,
+    DIRVOTE_RECOMMEND_RELAY_PROTO,
+    DIRVOTE_RECOMMEND_CLIENT_PROTO,
     DIRVOTE_REQUIRE_RELAY_PROTO,
     DIRVOTE_REQUIRE_CLIENT_PROTO,
   };