Merge remote-tracking branch 'arma/bug3886'

Conflicts:
	src/or/dirserv.c

diff --cc src/or/dirserv.c
index ef6c35e739b0be05e9c1f68545e2e6ef9032ad6e,00b8205893d4f8f4bdc65f33b235787da49c100d..67b18fb523bd45e090f74b805214a220c60949a8
--- 1/src/or/dirserv.c
--- 2/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@@ -1855,8 -1821,8 +1855,8 @@@ dirserv_thinks_router_is_hs_dir(const r
     * *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);
 +          node->is_running);
  }
  
  /** Look through the routerlist, the Mean Time Between Failure history, and