Rename "proto " to "pr " in consensuses

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d3bc615abc4dc8e3d1ad3a0c69b230d3f7b3b3d1..d7a707d8475c5e78f74d1cd5aa64a217ffeac491 100644 (file)
--- 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 c65243cf09afef9a95bedfde3429b8cc6bd5a7f3..9b41e8f44988085fdf86ece606ce5c38b8d8cd33 100644 (file)
--- 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 459a939fb7040aa6c4720ad583ec746dda0c55a7..aecf6a27234ae4f9c605475cf2e173e635c1ee1e 100644 (file)
--- 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
 };