summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-07-16 15:38:10 +0200
committerNick Mathewson <nickm@torproject.org>2014-07-16 15:38:10 +0200
commitf74a932e0b68205b180c6894b036ab3193144390 (patch)
treecb35cd401f40491efeddf2f6345f5d0d8e6bad6d /src/or
parente669e910f46820350a31826368868bfd4b913e70 (diff)
parent43bba9541af26ababa4854fa960ffe0e37d920e9 (diff)
downloadtor-f74a932e0b68205b180c6894b036ab3193144390.tar.gz
tor-f74a932e0b68205b180c6894b036ab3193144390.zip
Merge remote-tracking branch 'sysrqb/bug12573'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/dirserv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index aedd092522..a033f8be6d 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1468,7 +1468,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
* to fix the bug was 0.2.2.25-alpha. */
return (router->wants_to_be_hs_dir && router->dir_port &&
uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
- node->is_running);
+ router_is_active(router, node, now));
}
/** Don't consider routers with less bandwidth than this when computing