[tor-commits] [tor/master] Rename "proto " to "pr " in consensuses

[nickm@xxxxxxxxxxxxxx]

commit f3382bd7223a3e5c0e6f1c32dc7d9e8a2d28fb36
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 22 10:14:39 2016 -0400

    Rename "proto " to "pr " in consensuses
---
 src/or/dirserv.c     | 2 +-
 src/or/dirvote.c     | 2 +-
 src/or/routerparse.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d3bc615..d7a707d 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1861,7 +1861,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version,
     smartlist_add_asprintf(chunks, "v %s\n", version);
   }
   if (protocols) {
-    smartlist_add_asprintf(chunks, "proto %s\n", protocols);
+    smartlist_add_asprintf(chunks, "pr %s\n", protocols);
   }
 
   if (format != NS_V2) {
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index c65243c..9b41e8f 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2047,7 +2047,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
       smartlist_add(chunks, tor_strdup("\n"));
       if (chosen_protocol_list &&
           consensus_method >= MIN_METHOD_FOR_RS_PROTOCOLS) {
-        smartlist_add_asprintf(chunks, "proto %s\n", chosen_protocol_list);
+        smartlist_add_asprintf(chunks, "pr %s\n", chosen_protocol_list);
       }
       /*     Now the weight line. */
       if (rs_out.has_bandwidth) {
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 459a939..aecf6a2 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -389,7 +389,7 @@ static token_rule_t rtrstatus_token_table[] = {
   T01("w",                   K_W,                   ARGS,    NO_OBJ ),
   T0N("m",                   K_M,               CONCAT_ARGS, NO_OBJ ),
   T0N("id",                  K_ID,                  GE(2),   NO_OBJ ),
-  T01("proto",               K_PROTO,           CONCAT_ARGS, NO_OBJ ),
+  T01("pr",                  K_PROTO,           CONCAT_ARGS, NO_OBJ ),
   T0N("opt",                 K_OPT,             CONCAT_ARGS, OBJ_OK ),
   END_OF_TABLE
 };



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits