commit 0a4649e6576cacc07c215c481fd1c500cd563a3b Merge: eecf883 b8ffb00 Author: Roger Dingledine arma@torproject.org Date: Fri May 20 03:03:46 2011 -0400

Merge branch 'maint-0.2.2'

changes/bug3252 | 4 ++++ src/or/config.c | 2 +- src/or/connection.c | 2 +- src/or/dns.c | 9 ++++++--- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- src/or/router.h | 2 +- 7 files changed, 28 insertions(+), 14 deletions(-)

diff --cc src/or/router.c index e2791c1,49a986d..8b2c797 --- a/src/or/router.c +++ b/src/or/router.c @@@ -911,10 -905,10 +911,10 @@@ router_orport_found_reachable(void if (!can_reach_or_port && me) { log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", - get_options()->_PublishServerDescriptor != NO_AUTHORITY ? + get_options()->_PublishServerDescriptor != NO_DIRINFO ? " Publishing server descriptor." : ""); can_reach_or_port = 1; - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("ORPort found reachable"); control_event_server_status(LOG_NOTICE, "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d", me->address, me->or_port);