diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:22:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:22:31 -0500 |
| commit | dff390dcc73d0af3fc1322e035f1021b988232bf (patch) | |
| tree | c33000713eed59c2ca4a8a376c7dc9a262f3ae53 | |
| parent | 3e5b1c2d95d2270d2e7b9e137c5ec04e0e534659 (diff) | |
| parent | 6ff7850f2617a0e565c2fd13deb5aaebf39e974a (diff) | |
| download | tor-dff390dcc73d0af3fc1322e035f1021b988232bf.tar.gz tor-dff390dcc73d0af3fc1322e035f1021b988232bf.zip | |
Merge branch 'bug21108_029' into maint-0.2.9
| -rw-r--r-- | changes/bug21108_029 | 6 | ||||
| -rw-r--r-- | src/or/dirserv.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/changes/bug21108_029 b/changes/bug21108_029 new file mode 100644 index 0000000000..3a3f004fc6 --- /dev/null +++ b/changes/bug21108_029 @@ -0,0 +1,6 @@ + o Major bugfixes (directory authority): + - During voting, when marking a node as a probable sybil, do not + clear its BadExit flag: sybils can still be bad in other ways + too. (We still clear the other flags.) Fixes bug 21108; bugfix + on 0.2.0.13-alpha. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 34db06355b..1b614b949e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2233,13 +2233,17 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs) /** 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. + * + * 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) { rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = rs->is_named = rs->is_valid = - rs->is_hs_dir = rs->is_possible_guard = rs->is_bad_exit = 0; + rs->is_hs_dir = rs->is_v2_dir = rs->is_possible_guard = 0; /* FFFF we might want some mechanism to check later on if we * missed zeroing any flags: it's easy to add a new flag but * forget to add it to this clause. */ |