From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 May 2011 19:18:59 +0000 (-0400)
Subject: Merge branch 'bug3045' into maint-0.2.2
X-Git-Tag: tor-0.2.2.28-beta~5^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e67a240381c76b8d18dab862256b73c72d2711f;p=thirdparty%2Ftor.git

Merge branch 'bug3045' into maint-0.2.2

Conflicts:
	src/or/circuitbuild.c
---

7e67a240381c76b8d18dab862256b73c72d2711f
diff --cc src/or/circuitbuild.c
index 9509b5ad18,469e180072..2f70b67d23
--- 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) {