commit 8e3939519999f73fadad1a8b8cff75aad0667312 Merge: 40b7dfa 0f50f5f Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 9 12:26:16 2014 -0400

Merge remote-tracking branch 'asn/bug13064'

changes/bug13064 | 3 +++ src/or/dirserv.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)

diff --cc src/or/dirserv.c index 92d34e2,17a7ad9..1139dc1 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -2142,12 -2320,8 +2142,7 @@@ set_routerstatus_from_routerinfo(router } else { rs->is_possible_guard = 0; } - if (options->TestingTorNetwork && - routerset_contains_routerstatus(options->TestingDirAuthVoteGuard, - rs, 0)) { - rs->is_possible_guard = 1; - }

- rs->is_bad_directory = listbaddirs && node->is_bad_directory; rs->is_bad_exit = listbadexits && node->is_bad_exit; node->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, node, now); rs->is_hs_dir = vote_on_hsdirs && node->is_hs_dir;