Merge branch 'bug21108_029'

diff --cc src/or/dirserv.c
index 71dcbb6a9c83e3aa26fa3989dcf2895b3c2eb3b4,1b614b949e08fffda395347426363dd8a11db713..59d0c88381e4cbf08b266020e064da132755cd7b
--- 1/src/or/dirserv.c
--- 2/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)