From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jan 2017 23:51:26 +0000 (-0500)
Subject: Merge branch 'bug21108_029'
X-Git-Tag: tor-0.3.0.3-alpha~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5aec6ac3726d0202be7caa64acf1f02d2eac653;p=thirdparty%2Ftor.git

Merge branch 'bug21108_029'
---

a5aec6ac3726d0202be7caa64acf1f02d2eac653
diff --cc src/or/dirserv.c
index 71dcbb6a9c,1b614b949e..59d0c88381
--- 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)