Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/dirserv.c

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

diff --cc src/or/dirserv.c
index c591d906e32b0b5591693317d833f7e7f0eeec71,d114d8654efddfe2f1609f19bcdf3f5f9cfe179f..fef9450d707e743acedb0ee87c99a6ab54c1be4a
--- 1/src/or/dirserv.c
--- 2/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@@ -2835,8 -2812,8 +2835,8 @@@ generate_v2_networkstatus_opinion(void
                 "dir-options%s%s%s%s\n"
                 "%s" /* client version line, server version line. */
                 "dir-signing-key\n%s",
 -               hostname, ipaddr,
 +               hostname, fmt_addr32(addr),
-                (int)router_get_advertised_dir_port(options),
+                (int)router_get_advertised_dir_port(options, 0),
                 fingerprint,
                 contact,
                 published,

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

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