[tor-commits] [tor/master] Add changes file for 8712; apply it to HSDir flag as well.

[nickm at torproject.org]

commit a65e835800b1af2c2a4c215b0c8ab282e14105b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 14 14:03:30 2015 -0400

    Add changes file for 8712; apply it to HSDir flag as well.
---
 changes/8712     |    6 ++++++
 src/or/dirserv.c |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/8712 b/changes/8712
new file mode 100644
index 0000000..c7423e8
--- /dev/null
+++ b/changes/8712
@@ -0,0 +1,6 @@
+  o Minor features (directory authorities):
+    - Directory authorities no longer vote against the "Fast",
+      "Stable", and "HSDir" flags just because they were going to vote
+      against "Running": if the consensus turns out to be that the
+      router was running, then the authority's vote should count.
+      Patch from Peter Retzlaff; closes issue 8712.
\ No newline at end of file
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 8ad8bfe..71be626 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1372,8 +1372,7 @@ 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 &&
-          router_is_active(router, node, now));
+          uptime >= get_options()->MinUptimeHidServDirectoryV2);
 }
 
 /** Don't consider routers with less bandwidth than this when computing