summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-04-28 20:38:50 -0400
committerNick Mathewson <nickm@torproject.org>2011-04-28 20:38:50 -0400
commit9d67d16c6a99c662f0fe81068f66de471b39a616 (patch)
tree27e2381e7221328b7f1aec8f1445d4df9b47f798 /src/or/dirserv.c
parentbb8689b86480d81aa150d5f27fa830afc4de4077 (diff)
parent5693fedb60ee19048d45ed892edb07925b52678b (diff)
downloadtor-9d67d16c6a99c662f0fe81068f66de471b39a616.tar.gz
tor-9d67d16c6a99c662f0fe81068f66de471b39a616.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 759b1cfa6c..bbd25da054 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1839,6 +1839,9 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
* 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 &&
uptime > get_options()->MinUptimeHidServDirectoryV2 &&
node->is_running);