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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index f143e9b76b..9fedbf4c68 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1086,17 +1086,17 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
                                              TO_CONN(conn)->port);
 
     if (transport_name) {
-      log_warn(LD_GENERAL, "We were supposed to connect to bridge '%s:%u' "
+      log_warn(LD_GENERAL, "We were supposed to connect to bridge '%s' "
                "using pluggable transport '%s', but we can't find a pluggable "
                "transport proxy supporting '%s'. This can happen if you "
                "haven't provided a ClientTransportPlugin line, or if "
                "your pluggable transport proxy stopped running.",
-               fmt_addr(&TO_CONN(conn)->addr), TO_CONN(conn)->port,
+               fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port),
                transport_name, transport_name);
     } else {
-      log_warn(LD_GENERAL, "Tried to connect to '%s:%u' through a proxy, but "
+      log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but "
                "the proxy address could not be found.",
-               fmt_addr(&TO_CONN(conn)->addr), TO_CONN(conn)->port);
+               fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port));
     }
 
     connection_free(TO_CONN(conn));