diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-05-03 21:54:18 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-05-03 21:54:18 -0400 |
commit | fac99f01dadc104db8ccaf7a24da2a57860b4165 (patch) | |
tree | 1a5993961024dc56454d500e967b660a117b7081 /src | |
parent | 5ee5103f63324d7cf5f4ff8bd0fc822f1d6507d2 (diff) | |
parent | 4126de6888de54b5fc825d209ff1bfbe73cd9514 (diff) | |
download | tor-fac99f01dadc104db8ccaf7a24da2a57860b4165.tar.gz tor-fac99f01dadc104db8ccaf7a24da2a57860b4165.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
-rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2b5638beb3..5127ec8fc8 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1507,7 +1507,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) circ->build_state->is_internal ? "internal" : "exit", circ->build_state->need_uptime ? " (high-uptime)" : "", circ->build_state->desired_path_len, - circ->_base.state == CIRCUIT_STATE_OPEN ? "" : ", exit ", + circ->_base.state == CIRCUIT_STATE_OPEN ? "" : ", last hop ", circ->_base.state == CIRCUIT_STATE_OPEN ? "" : (nickname?nickname:"*unnamed*")); smartlist_add(elements, cp); |