aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-11 08:38:30 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-11 08:42:19 -0400
commit7ee7149389fe189e03ba5a3a7bd312e748c2c9c8 (patch)
tree24d8df4f782f9d086114379653f5ec929957dc80 /src/or/dirserv.c
parent81e0fd8360d66a8e9901a50ca2245ffedc89fc3c (diff)
downloadtor-7ee7149389fe189e03ba5a3a7bd312e748c2c9c8.tar.gz
tor-7ee7149389fe189e03ba5a3a7bd312e748c2c9c8.zip
Make HSDir depend on Running/Valid again.
When we removed Running/Valid checks from Fast and Stable in 8712, I removed them from HSDir too, which apparently wasn't a good idea. Reverts part of a65e835800b1af2c2a4c215b. Fixes bug 16524. Bugfix on 0.2.7.2-alpha.
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 072a3390da..e70b1b422d 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1373,7 +1373,8 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
return (router->wants_to_be_hs_dir && router->dir_port &&
node->is_stable &&
- uptime >= get_options()->MinUptimeHidServDirectoryV2);
+ uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
+ router_is_active(router, node, now));
}
/** Don't consider routers with less bandwidth than this when computing