summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-11 12:11:42 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-11 12:11:42 -0400
commita368cadf9514cf31deebed8613c4fd833b1448bf (patch)
tree7d2030bcf0ca3ed19386e19315523516160c7b10 /src/or
parent6247f5a5ba6d300cd64a2639296c3514dcb70066 (diff)
parentc3a0cdeaab5aa4e4f60df7c6a798fd8c3a2f251d (diff)
downloadtor-a368cadf9514cf31deebed8613c4fd833b1448bf.tar.gz
tor-a368cadf9514cf31deebed8613c4fd833b1448bf.zip
Merge branch 'bug18982'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuitbuild.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 257edab50b..9a95015005 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2442,8 +2442,8 @@ 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.",
- cur_len);
+ log_debug(LD_CIRC, "Contemplating intermediate hop #%d: random choice.",
+ cur_len+1);
excluded = smartlist_new();
if ((r = build_state_get_exit_node(state))) {
nodelist_add_node_and_family(excluded, r);
@@ -2577,12 +2577,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 "
- "this circuit.", cur_len);
+ 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));