July 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 5b31efe174a90dfaae35824694c16f06287a689b Merge: 6c4a6d170 6095bbf74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 16:57:32 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 src/test/test_routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.1] test: Use a 64-bit comparison for logging domains.
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 6095bbf74ec9ea1eb6eaba15939766cad0a3b235 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 16:57:06 2019 -0400 test: Use a 64-bit comparison for logging domains. --- src/test/test_routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 84ec8cc46..6d596e87e 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -631,7 +631,7 @@ mock_clock_skew_warning(const connection_t *conn, long apparent_skew, (void)conn; mock_apparent_skew = apparent_skew; tt_int_op(trusted, OP_EQ, 1); - tt_int_op(domain, OP_EQ, LD_GENERAL); + tt_i64_op(domain, OP_EQ, LD_GENERAL); tt_str_op(received, OP_EQ, "microdesc flavor consensus"); tt_str_op(source, OP_EQ, "CONSENSUS"); done:

1 0

[tor/release-0.4.1] test: Use a 64-bit comparison for logging domains.
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 6095bbf74ec9ea1eb6eaba15939766cad0a3b235 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 16:57:06 2019 -0400 test: Use a 64-bit comparison for logging domains. --- src/test/test_routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 84ec8cc46..6d596e87e 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -631,7 +631,7 @@ mock_clock_skew_warning(const connection_t *conn, long apparent_skew, (void)conn; mock_apparent_skew = apparent_skew; tt_int_op(trusted, OP_EQ, 1); - tt_int_op(domain, OP_EQ, LD_GENERAL); + tt_i64_op(domain, OP_EQ, LD_GENERAL); tt_str_op(received, OP_EQ, "microdesc flavor consensus"); tt_str_op(source, OP_EQ, "CONSENSUS"); done:

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 25 Jul '19

25 Jul '19

commit 00e4324a2c99cf6d5737df29bc7b351371ff9e75 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 25 15:50:31 2019 +0000 Update translations for tpo-web --- contents+fi.po | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/contents+fi.po b/contents+fi.po index d9a065590..4f08a74be 100644 --- a/contents+fi.po +++ b/contents+fi.po @@ -271,6 +271,8 @@ msgid "" "Their answer was to create and deploy the first research designs and " "prototypes of onion routing." msgstr "" +"Heidän vastauksensa oli luoda ja lähettää sipulireititysteknologian " +"ensimmäiset tutkimussuunnitelmat ja -prototyypit." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -279,11 +281,14 @@ msgid "" " privacy as possible, and the idea was to route traffic through multiple " "servers and encrypt it each step of the way." msgstr "" +"Sipulireitityksen päämääränä oli kehittää keino käyttää Internettiä niin " +"yksityisesti kuin mahdollista. Ajatuksena oli reitittää liikennettä monen " +"palvelimen läpi ja salata se joka vaiheessa." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "This is still a simple explanation for how Tor works today." -msgstr "" +msgstr "Tämä on yhä yksinkertainen selitys Torin nykyisestä toiminnasta." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -292,6 +297,10 @@ msgid "" "Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL " "onion routing project with Paul Syverson." msgstr "" +"2000-luvun alussa Roger Dingledine, joka oli vasta valmistunut " +"[Massachusetts Institute of Technologysta (MIT)](https://web.mit.edu/) " +"alkoi työskennellä NRL-sipulireititysprojektin parissa Paul Syversonin " +"kanssa." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -301,6 +310,10 @@ msgid "" "stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, " "joined the project soon after." msgstr "" +"Erottaakseen tämän alkuperäisen NRL-työn muista sipulireititysyrityksistä, " +"joita alkoi ilmaantua muualla, Roger nimesi projektin Tor'iksi, joka oli " +"lyhenne sanoista The Onion Routing. Nick Mathewson, Rogerin luokkatoveri " +"MITssä, liittyi projektiin pian tämän jälkeen." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0

[tor/release-0.4.1] More edits, and pick a release date
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 6c4a6d170012c382e29ba270fcf7084ddb7cd2af Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 11:30:41 2019 -0400 More edits, and pick a release date (thanks to seborn) --- ChangeLog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57a99e613..3ee219f0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.4.1.4-rc - 2019-07-?? +Changes in version 0.4.1.4-rc - 2019-07-25 Tor 0.4.1.4-rc fixes a few bugs from previous versions of Tor, and updates to a new list of fallback directories. If no new bugs are found, the next release in the 0.4.1.x serious should be stable. @@ -7,7 +7,7 @@ Changes in version 0.4.1.4-rc - 2019-07-?? - When considering upgrading circuits from "waiting for guard" to "open", always ignore circuits that are marked for close. Otherwise, we can end up in the situation where a subsystem is notified that - a closing circuits has just opened, leading to undesirable + a closing circuit has just opened, leading to undesirable behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha. o Minor features (continuous integration): @@ -22,14 +22,14 @@ Changes in version 0.4.1.4-rc - 2019-07-?? o Minor bugfixes (circuit padding): - On relays, properly check that a padding machine is absent before - logging a warn about it being absent. Fixes bug 30649; bugfix + logging a warning about it being absent. Fixes bug 30649; bugfix on 0.4.1.1-alpha. - Add two NULL checks in unreachable places to silence Coverity (CID 144729 and 1447291) and better future-proof ourselves. Fixes bug 31024; bugfix on 0.4.1.1-alpha. o Minor bugfixes (crash on exit): - - Avoid a set of possible code paths that could use try to use freed + - Avoid a set of possible code paths that could try to use freed memory in routerlist_free() while Tor was exiting. Fixes bug 31003; bugfix on 0.1.2.2-alpha.

1 0

[tor/release-0.4.1] more entries for 0.4.1.4-rc changelog
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit f05624030a88bd8e3c96b9784e649c4bd2d521d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 11:02:29 2019 -0400 more entries for 0.4.1.4-rc changelog --- ChangeLog | 15 +++++++++++++++ changes/bug31024 | 4 ---- changes/bug31027 | 3 --- changes/bug31080_041 | 4 ---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca6ebaff2..a3e6d014f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,16 +25,31 @@ Changes in version 0.4.1.4-rc - 2019-07-?? logging a warn about it being absent. Fixes bug 30649; bugfix on 0.4.1.1-alpha. + o Minor bugfixes (circuitpadding): + - Add two NULL checks in unreachable places to silence Coverity (CID + 144729 and 1447291) and better future proof ourselves. Fixes bug + 31024; bugfix on 0.4.1.1-alpha. + o Minor bugfixes (crash on exit): - Avoid a set of possible code paths that could use try to use freed memory in routerlist_free() while Tor was exiting. Fixes bug 31003; bugfix on 0.1.2.2-alpha. + o Minor bugfixes (logging): + - Fix a conflict between the flag used for messaging-domain log + messages, and the LD_NO_MOCK testing flag. Fixes bug 31080; bugfix + on 0.4.1.1-alpha. + o Minor bugfixes (memory leaks): - Fix a trivial memory leak when parsing an invalid value from a download schedule in the configuration. Fixes bug 30894; bugfix on 0.3.4.1-alpha. + o Code simplification and refactoring: + - Remove some dead code from circpad_machine_remove_token() to fix + some Coverity warnings (CID 1447298). Fixes bug 31027; bugfix + on 0.4.1.1-alpha. + Changes in version 0.4.1.3-alpha - 2019-06-25 Tor 0.4.1.3-alpha resolves numerous bugs left over from the previous diff --git a/changes/bug31024 b/changes/bug31024 deleted file mode 100644 index 888fb2a26..000000000 --- a/changes/bug31024 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (circuitpadding): - - Add two NULL checks in unreachable places to silence Coverity (CID 144729 - and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix - on 0.4.1.1-alpha. \ No newline at end of file diff --git a/changes/bug31027 b/changes/bug31027 deleted file mode 100644 index dd3ce20b6..000000000 --- a/changes/bug31027 +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring: - - Remove some dead code from circpad_machine_remove_token() to fix some - Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 0.4.1.1-alpha. \ No newline at end of file diff --git a/changes/bug31080_041 b/changes/bug31080_041 deleted file mode 100644 index 1fe9ec508..000000000 --- a/changes/bug31080_041 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (logging): - - Fix a conflict between the flag used for messaging-domain - log messages, and the LD_NO_MOCK testing flag. Fixes bug 31080; - bugfix on 0.4.1.1-alpha.

1 0

[tor/release-0.4.1] Changelog edits
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 15f49acb7fa3d0f60b51bdc5050078175f253986 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 11:06:00 2019 -0400 Changelog edits --- ChangeLog | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3e6d014f..57a99e613 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,9 +5,9 @@ Changes in version 0.4.1.4-rc - 2019-07-?? o Major bugfixes (circuit build, guard): - When considering upgrading circuits from "waiting for guard" to - "open", always ignore the ones that are mark for close. Else, we - can end up in the situation where a subsystem is notified of that - circuit opening but still marked for close leading to undesirable + "open", always ignore circuits that are marked for close. Otherwise, + we can end up in the situation where a subsystem is notified that + a closing circuits has just opened, leading to undesirable behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha. o Minor features (continuous integration): @@ -24,10 +24,8 @@ Changes in version 0.4.1.4-rc - 2019-07-?? - On relays, properly check that a padding machine is absent before logging a warn about it being absent. Fixes bug 30649; bugfix on 0.4.1.1-alpha. - - o Minor bugfixes (circuitpadding): - Add two NULL checks in unreachable places to silence Coverity (CID - 144729 and 1447291) and better future proof ourselves. Fixes bug + 144729 and 1447291) and better future-proof ourselves. Fixes bug 31024; bugfix on 0.4.1.1-alpha. o Minor bugfixes (crash on exit):

1 0

[tor/maint-0.4.1] Remove dead code from circpad_machine_remove_token().
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit bd1ac408d854758cc40bde88cc5f71b46661b51c Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:38:14 2019 +0300 Remove dead code from circpad_machine_remove_token(). --- changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug31027 b/changes/bug31027 new file mode 100644 index 000000000..dd3ce20b6 --- /dev/null +++ b/changes/bug31027 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove some dead code from circpad_machine_remove_token() to fix some + Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 0214cc421..626787da7 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -1083,8 +1083,11 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) state = circpad_machine_current_state(mi); + /* If we are not in a padding state (like start or end), we're done */ + if (!state) + return; /* Don't remove any tokens if we're not doing token removal */ - if (!state || state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) + if (state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) return; current_time = monotime_absolute_usec(); @@ -1103,10 +1106,6 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) timer_disable(mi->padding_timer); } - /* If we are not in a padding state (like start or end), we're done */ - if (!state) - return; - /* Perform the specified token removal strategy */ switch (state->token_removal) { case CIRCPAD_TOKEN_REMOVAL_CLOSEST_USEC:

1 0

[tor/maint-0.4.1] Always check the retval of circpad_machine_current_state().
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit af26cd61015a2c127dbcf7e3db91da91adb415f9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:46:43 2019 +0300 Always check the retval of circpad_machine_current_state(). --- changes/bug31024 | 4 ++++ src/core/or/circuitpadding.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug31024 b/changes/bug31024 new file mode 100644 index 000000000..888fb2a26 --- /dev/null +++ b/changes/bug31024 @@ -0,0 +1,4 @@ + o Minor bugfixes (circuitpadding): + - Add two NULL checks in unreachable places to silence Coverity (CID 144729 + and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix + on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 626787da7..c4670bbc2 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -450,6 +450,9 @@ circpad_is_token_removal_supported(circpad_machine_runtime_t *mi) /* Machines that do want token removal are less sensitive to performance. * Let's spend some time to check that our state is consistent and sane */ const circpad_state_t *state = circpad_machine_current_state(mi); + if (BUG(!state)) { + return 1; + } tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE); tor_assert_nonfatal(state->histogram_len == mi->histogram_len); tor_assert_nonfatal(mi->histogram_len != 0); @@ -1667,6 +1670,9 @@ circpad_estimate_circ_rtt_on_received(circuit_t *circ, } } else { const circpad_state_t *state = circpad_machine_current_state(mi); + if (BUG(!state)) { + return; + } /* Since monotime is unpredictably expensive, only update this field * if rtt estimates are needed. Otherwise, stop the rtt update. */

1 0

[tor/master] Remove dead code from circpad_machine_remove_token().
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit bd1ac408d854758cc40bde88cc5f71b46661b51c Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:38:14 2019 +0300 Remove dead code from circpad_machine_remove_token(). --- changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug31027 b/changes/bug31027 new file mode 100644 index 000000000..dd3ce20b6 --- /dev/null +++ b/changes/bug31027 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove some dead code from circpad_machine_remove_token() to fix some + Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 0214cc421..626787da7 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -1083,8 +1083,11 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) state = circpad_machine_current_state(mi); + /* If we are not in a padding state (like start or end), we're done */ + if (!state) + return; /* Don't remove any tokens if we're not doing token removal */ - if (!state || state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) + if (state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) return; current_time = monotime_absolute_usec(); @@ -1103,10 +1106,6 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) timer_disable(mi->padding_timer); } - /* If we are not in a padding state (like start or end), we're done */ - if (!state) - return; - /* Perform the specified token removal strategy */ switch (state->token_removal) { case CIRCPAD_TOKEN_REMOVAL_CLOSEST_USEC:

1 0