Merge remote-tracking branch 'arma/bug3886'

Conflicts:
	src/or/dirserv.c

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.

src/or/dirserv.c

@@ -1855,7 +1855,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
    * *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 &&
           node->is_running);
 }