commit c3a0cdeaab5aa4e4f60df7c6a798fd8c3a2f251d Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 11 12:11:27 2017 -0400

Add # to "hop N" messages to disambiguate from old messages. --- src/or/circuitbuild.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 48e4b75ff..0c57b0b25 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));