From: Roger Dingledine <arma@torproject.org>
Date: Thu, 1 Sep 2011 07:13:27 +0000 (-0400)
Subject: let private tor networks more reliably handle hidden services
X-Git-Tag: tor-0.2.3.17-beta~37^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44f6be4681cd3fcdab0e1a6d892b8918373e12d3;p=thirdparty%2Ftor.git

let private tor networks more reliably handle hidden services

this is a tweak on the fix in f87c6f100d (see also #2088)
---

diff --git a/changes/bug3886 b/changes/bug3886
new file mode 100644
index 0000000000..691d4ef327
--- /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 7df9a2fcaa..00b8205893 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);
 }