From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Jun 2011 16:56:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4a3de3def27a7c7f8a514546b33662d0cfe6c5;p=thirdparty%2Ftor.git

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

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

0a4a3de3def27a7c7f8a514546b33662d0cfe6c5
diff --cc src/or/dirserv.c
index c591d906e3,d114d8654e..fef9450d70
--- a/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,