diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-02 10:16:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-02 10:16:48 -0500 |
| commit | 55639bc67f66e0bb41af1474ce8654d49faf9a61 (patch) | |
| tree | 469aec8f307c4880ce397a55da366c2638fa289a | |
| parent | e78b7e27761df246349b4eee7667c304a68b73fd (diff) | |
| parent | 80bed1ac96a3035f8c55ddced5528f0d7d16d386 (diff) | |
| download | tor-55639bc67f66e0bb41af1474ce8654d49faf9a61.tar.gz tor-55639bc67f66e0bb41af1474ce8654d49faf9a61.zip | |
Merge remote-tracking branch 'dgoulet/bug14202_026_v1'
| -rw-r--r-- | changes/bug14202 | 3 | ||||
| -rw-r--r-- | src/or/dirserv.c | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/changes/bug14202 b/changes/bug14202 new file mode 100644 index 0000000000..2bb4ba1776 --- /dev/null +++ b/changes/bug14202 @@ -0,0 +1,3 @@ + o Minor cleanup + - Remove workaround in dirserv_thinks_router_is_hs_dir() that was only + for version <= 0.2.2.24 which is now deprecated. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 0be2a2071e..d90619520b 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)); } |