summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-29 08:06:21 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-29 08:06:21 -0400
commit4e76b206b5fac18805a5cb2c3440dd367bd3b92d (patch)
tree07365642309428515dd9ef72d7ae4cb0eb4a2532 /src
parente1f4d9552e6d6e42b028d8d405b6d182e81ce326 (diff)
parentc4208ef65f58836670dab286bad0289259582124 (diff)
downloadtor-4e76b206b5fac18805a5cb2c3440dd367bd3b92d.tar.gz
tor-4e76b206b5fac18805a5cb2c3440dd367bd3b92d.zip
Merge remote-tracking branch 'arma/feature18624'
Diffstat (limited to 'src')
-rw-r--r--src/or/dirserv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index a045f3ac55..f012b7bf64 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2200,7 +2200,7 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
rs->is_valid = node->is_valid;
- if (node->is_fast &&
+ if (node->is_fast && node->is_stable &&
((options->AuthDirGuardBWGuarantee &&
routerbw_kb >= options->AuthDirGuardBWGuarantee/1000) ||
routerbw_kb >= MIN(guard_bandwidth_including_exits_kb,