[tor-commits] [tor/master] let private tor networks more reliably handle hidden services

[nickm at torproject.org]

commit 44f6be4681cd3fcdab0e1a6d892b8918373e12d3
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Sep 1 03:13:27 2011 -0400

    let private tor networks more reliably handle hidden services
    
    this is a tweak on the fix in f87c6f100d (see also #2088)
---
 changes/bug3886  |    5 +++++
 src/or/dirserv.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/changes/bug3886 b/changes/bug3886
new file mode 100644
index 0000000..691d4ef
--- /dev/null
+++ b/changes/bug3886
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Fix an edge case where TestingTorNetwork is set but the authorities
+      and relays all have an uptime of zero, where the private Tor network
+      could briefly lack support for hidden services. Fixes bug 3886;
+      bugfix on 0.2.2.18-alpha.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7df9a2f..00b8205 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1821,7 +1821,7 @@ dirserv_thinks_router_is_hs_dir(routerinfo_t *router, time_t now)
    * *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 &&
+          uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
           router->is_running);
 }