[tor-commits] [tor/master] Only active relays should be given HSDir

[nickm at torproject.org]

commit 43bba9541af26ababa4854fa960ffe0e37d920e9
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Jul 9 00:08:09 2014 +0000

    Only active relays should be given HSDir
    
    We should only assign a relay the HSDir flag if it is currently
    considered valid. We can accomplish this by only considering active
    relays, and as a consequence of this we also exclude relays that are
    currently hibernating. Fixes #12573
---
 changes/bug12573 |    5 +++++
 src/or/dirserv.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug12573 b/changes/bug12573
new file mode 100644
index 0000000..46e3ee2
--- /dev/null
+++ b/changes/bug12573
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - Relays should not be assigned the HSDir flag if they are
+      considered invalid. Also, do not assign the HSDir flag to relays
+      that are currently hibernating. Fixes #12573. Bugfix on
+      tor-0.2.0.10-alpha
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index aedd092..a033f8b 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