From 80bed1ac96a3035f8c55ddced5528f0d7d16d386 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 29 Jan 2015 12:52:18 -0500 Subject: Remove obsolete workaround in dirserv_thinks_router_is_hs_dir() Fixes #14202 Signed-off-by: David Goulet --- src/or/dirserv.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/or/dirserv.c') diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b694f8af77..35799242bc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1305,14 +1305,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, else uptime = real_uptime(router, now); - /* XXX We shouldn't need to check dir_port, but we do because of - * bug 1693. In the future, once relays set wants_to_be_hs_dir - * correctly, we can revert to only checking dir_port if router's - * version is too old. */ - /* XXX Unfortunately, we need to keep checking dir_port until all - * *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 && + return (router->wants_to_be_hs_dir && uptime >= get_options()->MinUptimeHidServDirectoryV2 && router_is_active(router, node, now)); } -- cgit v1.2.3-54-g00ecf