Merge branch 'maint-0.2.2'

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

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

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

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

diff --cc src/or/router.c
index e2791c1c646b64fc4e607597886256e4653e09ab,49a986d64aac7a4e5871758c8a2e6a689c2abcb2..8b2c797bb664b715e35ac4188959bf304b3cd217
--- 1/src/or/router.c
--- 2/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);

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