[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 9d67d16c6a99c662f0fe81068f66de471b39a616
Merge: bb8689b 5693fed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 28 20:38:50 2011 -0400

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

 changes/bug2722     |   11 +++++++++++
 src/or/dirserv.c    |    3 +++
 src/or/routerlist.c |   10 ++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --cc src/or/dirserv.c
index 759b1cf,c8dda66..bbd25da
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@@ -1839,9 -1811,12 +1839,12 @@@ dirserv_thinks_router_is_hs_dir(const r
     * bug 1693. In the future, once relays set wants_to_be_hs_dir
     * correctly, we can revert to only checking dir_port if router's
     * version is too old. */
+   /* XXX Unfortunately, we need to keep checking dir_port until all
+    * *clients* suffering from bug 2722 are obsolete.  The first version
+    * to fix the bug was 0.2.2.25-alpha. */
    return (router->wants_to_be_hs_dir && router->dir_port &&
            uptime > get_options()->MinUptimeHidServDirectoryV2 &&
 -          router->is_running);
 +          node->is_running);
  }
  
  /** Look through the routerlist, the Mean Time Between Failure history, and