commit 0a4a3de3def27a7c7f8a514546b33662d0cfe6c5 Merge: 9ac2f63 df42eb0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 2 12:56:45 2011 -0400

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

Conflicts: src/or/dirserv.c

src/or/connection.c | 4 ++-- src/or/dirserv.c | 4 ++-- src/or/router.c | 18 +++++++++++------- src/or/router.h | 3 ++- 4 files changed, 17 insertions(+), 12 deletions(-)

diff --cc src/or/dirserv.c index c591d90,d114d86..fef9450 --- 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,