commit a5aec6ac3726d0202be7caa64acf1f02d2eac653 Merge: 09a00a2 6ff7850 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 31 18:51:26 2017 -0500

Merge branch 'bug21108_029'

changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc src/or/dirserv.c index 71dcbb6,1b614b9..59d0c88 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -2230,8 -2231,12 +2230,12 @@@ dirserv_set_routerstatus_testing(router }

/** Routerstatus <b>rs</b> is part of a group of routers that are on - * too narrow an IP-space. Clear out its flags: we don't want people - * using it. + * too narrow an IP-space. Clear out its flags since we don't want it be used + * because of its Sybil-like appearance. + * + * Leave its BadExit flag alone though, since if we think it's a bad exit, + * we want to vote that way in case all the other authorities are voting + * Running and Exit. */ static void clear_status_flags_on_sybil(routerstatus_t *rs)