Merge branch 'bug7011'

Conflicts:
	src/or/circuitbuild.c

The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.

diff --cc src/or/circuitbuild.c
index 749985f904df2db8123987d224e0122879bb2325,71f4408e269c1dd31cfd0305d02e43a7df9ba88c..3e20797a6ebf713fef8308adac8b352f46f0a4a5
--- 1/src/or/circuitbuild.c
--- 2/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@@ -1979,16 -1955,16 +1979,16 @@@ circuit_handle_first_hop(origin_circuit
    tor_assert(firsthop->extend_info);
  
    /* now see if we're already connected to the first OR in 'route' */
-   log_debug(LD_CIRC,"Looking for firsthop '%s:%u'",
-             fmt_addr(&firsthop->extend_info->addr),
-             firsthop->extend_info->port);
+   log_debug(LD_CIRC,"Looking for firsthop '%s'",
+             fmt_addrport(&firsthop->extend_info->addr,
+                          firsthop->extend_info->port));
  
 -  n_conn = connection_or_get_for_extend(firsthop->extend_info->identity_digest,
 -                                        &firsthop->extend_info->addr,
 -                                        &msg,
 -                                        &should_launch);
 +  n_chan = channel_get_for_extend(firsthop->extend_info->identity_digest,
 +                                  &firsthop->extend_info->addr,
 +                                  &msg,
 +                                  &should_launch);
  
 -  if (!n_conn) {
 +  if (!n_chan) {
      /* not currently connected in a useful way. */
      log_info(LD_CIRC, "Next router is %s: %s",
               safe_str_client(extend_info_describe(firsthop->extend_info)),
@@@ -2491,14 -2464,14 +2491,14 @@@ circuit_extend(cell_t *cell, circuit_t 
      return -1;
    }
  
 -  n_conn = connection_or_get_for_extend(id_digest,
 -                                        &n_addr,
 -                                        &msg,
 -                                        &should_launch);
 +  n_chan = channel_get_for_extend(id_digest,
 +                                  &n_addr,
 +                                  &msg,
 +                                  &should_launch);
  
 -  if (!n_conn) {
 +  if (!n_chan) {
-     log_debug(LD_CIRC|LD_OR,"Next router (%s:%d): %s",
-               fmt_addr(&n_addr), (int)n_port, msg?msg:"????");
+     log_debug(LD_CIRC|LD_OR,"Next router (%s): %s",
+               fmt_addrport(&n_addr, n_port), msg?msg:"????");
  
      circ->n_hop = extend_info_new(NULL /*nickname*/,
                                      id_digest,

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

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

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

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

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