Merge branch 'bug3045' into maint-0.2.2

Conflicts:
	src/or/circuitbuild.c

diff --cc src/or/circuitbuild.c
index 9509b5ad18e60564d8a6b5a7f7a6fa0b31498eec,469e1800725bb84c5f0186028f007fb8a25ca85f..2f70b67d230af4c2fcbb26bbde8e7b7d4f09675f
--- 1/src/or/circuitbuild.c
--- 2/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) {

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/command.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/rendclient.c
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/router.h
Simple merge

diff --cc src/or/routerparse.c
Simple merge