February 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Fix write_short_policy usage comment
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit e95b8f7df9faf61dea8f523da7548a7217aa831a Author: teor <teor2345(a)gmail.com> Date: Wed Feb 1 13:48:09 2017 +1100 Fix write_short_policy usage comment --- src/or/policies.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 227e168..1262bef 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -2624,8 +2624,7 @@ parse_short_policy(const char *summary) return result; } -/** Write policy back out into a string. Used only for unit tests - * currently. */ +/** Write policy back out into a string. */ char * write_short_policy(const short_policy_t *policy) {

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit e66c30e47c02c0243aba1935a06e95188210e84d Merge: 343a694 9379984 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:24:23 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21357 | 7 + src/or/policies.c | 95 +++++++-- src/or/policies.h | 3 + src/test/test_policy.c | 534 +++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 609 insertions(+), 30 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 64b0ee2e10c3eab605c66b0698a6a47de9cd6918 Merge: 2eac715 dff390d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:23:14 2017 -0500 Merge branch 'maint-0.2.9'

1 0

[tor/release-0.2.9] Do not clear is_bad_exit on sybil.
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit a47c133c869db74024c9ab50801cd6b7553409e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 31 14:12:14 2017 -0500 Do not clear is_bad_exit on sybil. But do clear is_v2_dir. Fixes bug 21108 -- bugfix on d95e7c7d67134b9b964d49cf8c2bdbf805a in 0.2.0.13-alpha. --- changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug21108_029 b/changes/bug21108_029 new file mode 100644 index 0000000..3a3f004 --- /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 34db063..cbed646 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2239,7 +2239,7 @@ 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. */

1 0

[tor/master] Merge branch 'bug21108_029' into maint-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit dff390dcc73d0af3fc1322e035f1021b988232bf Merge: 3e5b1c2 6ff7850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:22:31 2017 -0500 Merge branch 'bug21108_029' into maint-0.2.9 changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Do not clear is_bad_exit on sybil.
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit a47c133c869db74024c9ab50801cd6b7553409e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 31 14:12:14 2017 -0500 Do not clear is_bad_exit on sybil. But do clear is_v2_dir. Fixes bug 21108 -- bugfix on d95e7c7d67134b9b964d49cf8c2bdbf805a in 0.2.0.13-alpha. --- changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug21108_029 b/changes/bug21108_029 new file mode 100644 index 0000000..3a3f004 --- /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 34db063..cbed646 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2239,7 +2239,7 @@ 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. */

1 0

[tor/maint-0.2.9] be explicit in clear_status_flags_on_sybil that we leave BadExit alone
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 6ff7850f2617a0e565c2fd13deb5aaebf39e974a Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jan 31 15:06:15 2017 -0500 be explicit in clear_status_flags_on_sybil that we leave BadExit alone --- src/or/dirserv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index cbed646..1b614b9 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2233,6 +2233,10 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs) /** Routerstatus rs 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)

1 0

[tor/maint-0.2.9] Merge branch 'bug21108_029' into maint-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit dff390dcc73d0af3fc1322e035f1021b988232bf Merge: 3e5b1c2 6ff7850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:22:31 2017 -0500 Merge branch 'bug21108_029' into maint-0.2.9 changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'bug21108_029' into maint-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit dff390dcc73d0af3fc1322e035f1021b988232bf Merge: 3e5b1c2 6ff7850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:22:31 2017 -0500 Merge branch 'bug21108_029' into maint-0.2.9 changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] be explicit in clear_status_flags_on_sybil that we leave BadExit alone
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 6ff7850f2617a0e565c2fd13deb5aaebf39e974a Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jan 31 15:06:15 2017 -0500 be explicit in clear_status_flags_on_sybil that we leave BadExit alone --- src/or/dirserv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index cbed646..1b614b9 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2233,6 +2233,10 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs) /** Routerstatus rs 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)

1 0