commit 7e67a240381c76b8d18dab862256b73c72d2711f Merge: da7c60d 3c0d944 Author: Nick Mathewson nickm@torproject.org Date: Mon May 30 15:18:59 2011 -0400

Merge branch 'bug3045' into maint-0.2.2

Conflicts: src/or/circuitbuild.c

changes/bug3045 | 6 ++ src/or/circuitbuild.c | 43 +++++++++------ src/or/circuitlist.c | 6 ++- src/or/circuituse.c | 4 +- src/or/command.c | 4 +- src/or/connection_edge.c | 7 ++- src/or/directory.c | 9 ++-- src/or/dirserv.c | 45 +++++++++------- src/or/relay.c | 5 +- src/or/rendclient.c | 19 ++++--- src/or/rendservice.c | 31 ++++++----- src/or/rephist.c | 6 ++- src/or/router.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ src/or/router.h | 22 ++++++++ src/or/routerlist.c | 36 +++++++------ src/or/routerparse.c | 5 +- 16 files changed, 291 insertions(+), 93 deletions(-)

diff --cc src/or/circuitbuild.c index 9509b5a,469e180..2f70b67 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@@ -1753,10 -1753,9 +1753,9 @@@ circuit_handle_first_hop(origin_circuit

if (!n_conn) { /* not currently connected in a useful way. */ - const char *name = strlen(firsthop->extend_info->nickname) ? - firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr); - log_info(LD_CIRC, "Next router is %s: %s ", + log_info(LD_CIRC, "Next router is %s: %s", - safe_str_client(name), msg?msg:"???"); + safe_str_client(extend_info_describe(firsthop->extend_info)), + msg?msg:"???"); circ->_base.n_hop = extend_info_dup(firsthop->extend_info);

if (should_launch) {