[tor-commits] [tor/master] dirvote: Reorder required protocol lists

[nickm at torproject.org]

commit 64bb6e622dbce6448e29e4ff6140a1c6bb44c298
Author: teor <teor at torproject.org>
Date:   Wed Feb 12 22:06:11 2020 +1000

    dirvote: Reorder required protocol lists
    
    Use a consistent order, because the current order is going to trip
    someone up eventually.
    
    Preparation for 33285.
---
 src/feature/dirauth/dirvote.c | 4 ++--
 src/feature/dirauth/dirvote.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index ce40ec615..4e0e19dc9 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -4623,10 +4623,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
   v3_out->recommended_client_protocols =
     tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO);
 
-  v3_out->required_client_protocols =
-    tor_strdup(DIRVOTE_REQUIRE_CLIENT_PROTO);
   v3_out->required_relay_protocols =
     tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO);
+  v3_out->required_client_protocols =
+    tor_strdup(DIRVOTE_REQUIRE_CLIENT_PROTO);
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));
diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
index 46baa3043..cf9f1370e 100644
--- a/src/feature/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
@@ -238,12 +238,12 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
   "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
   "Link=4 Microdesc=1-2 Relay=2"
 
-#define DIRVOTE_REQUIRE_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_REQUIRE_RELAY_PROTO \
   "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
   "Link=3-4 Microdesc=1 Relay=1-2"
+#define DIRVOTE_REQUIRE_CLIENT_PROTO \
+  "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
+  "Link=4 Microdesc=1-2 Relay=2"
 
 #endif /* defined(DIRVOTE_PRIVATE) */