From: Roger Dingledine <arma@torproject.org>
Date: Fri, 20 May 2011 07:03:46 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4649e6576cacc07c215c481fd1c500cd563a3b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

0a4649e6576cacc07c215c481fd1c500cd563a3b
diff --cc src/or/router.c
index e2791c1c64,49a986d64a..8b2c797bb6
--- 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);