From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 Aug 2017 16:11:27 +0000 (-0400)
Subject: Add # to "hop N" messages to disambiguate from old messages.
X-Git-Tag: tor-0.3.2.1-alpha~162^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3a0cdeaab5aa4e4f60df7c6a798fd8c3a2f251d;p=thirdparty%2Ftor.git

Add # to "hop N" messages to disambiguate from old messages.
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 48e4b75ff9..0c57b0b255 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2111,7 +2111,7 @@ choose_good_middle_server(uint8_t purpose,
   tor_assert(CIRCUIT_PURPOSE_MIN_ <= purpose &&
              purpose <= CIRCUIT_PURPOSE_MAX_);
 
-  log_debug(LD_CIRC, "Contemplating intermediate hop %d: random choice.",
+  log_debug(LD_CIRC, "Contemplating intermediate hop #%d: random choice.",
             cur_len+1);
   excluded = smartlist_new();
   if ((r = build_state_get_exit_node(state))) {
@@ -2262,12 +2262,12 @@ onion_extend_cpath(origin_circuit_t *circ)
   }
 
   if (!info) {
-    log_warn(LD_CIRC,"Failed to find node for hop %d of our path. Discarding "
+    log_warn(LD_CIRC,"Failed to find node for hop #%d of our path. Discarding "
              "this circuit.", cur_len+1);
     return -1;
   }
 
-  log_debug(LD_CIRC,"Chose router %s for hop %d (exit is %s)",
+  log_debug(LD_CIRC,"Chose router %s for hop #%d (exit is %s)",
             extend_info_describe(info),
             cur_len+1, build_state_get_exit_nickname(state));