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

[tor/release-0.4.1] Fix #30649 changelog entry.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 262d97deb4e1b4add9285f91cc1b62a4c5abe058 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 2 11:46:22 2019 +0300 Fix #30649 changelog entry. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 439c435a7..637a1dfcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,7 +95,7 @@ Changes in version 0.4.1.4-rc - 2019-07-25 o Minor bugfixes (circuit padding): - On relays, properly check that a padding machine is absent before logging a warning about it being absent. Fixes bug 30649; bugfix - on 0.4.1.1-alpha. + on 0.4.0.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.

1 0

[tor/release-0.4.1] circpad: some more logging changes.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 5aa526c2d8a57183f54065ad5d907fc02a90688f Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 14:28:38 2019 +0300 circpad: some more logging changes. - Add an info log when receiving a STOP command. - Keep warning if we receive padding from a wrong hop. --- src/core/or/circuitpadding.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 8346ea4ae..aa38b0ffc 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2449,6 +2449,8 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) /* Free the machine corresponding to this machine type */ if (free_circ_machineinfos_with_machine_num(circ, negotiate->machine_type)) { + log_info(LD_CIRC, "Received STOP command for machine %u", + negotiate->machine_type); goto done; } log_fn(LOG_PROTOCOL_WARN, LD_CIRC, @@ -2498,7 +2500,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell, /* Verify this came from the expected hop */ if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) { - log_fn(LOG_PROTOCOL_WARN, LD_CIRC, + log_fn(LOG_WARN, LD_CIRC, "Padding negotiated cell from wrong hop!"); return -1; }

1 0

[tor/release-0.4.1] Add #30649 to ReleaseNotes.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 232202cc43c97c60c244fdbec729d2600928a7be Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Sep 3 17:07:50 2019 +0300 Add #30649 to ReleaseNotes. --- ReleaseNotes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index aa88c5321..60fcdd450 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -83,6 +83,9 @@ Changes in version 0.4.1.5 - 2019-08-20 of bug 29875; bugfix on 0.3.0.1-alpha. o Major bugfixes (circuit build, guard): + - On relays, properly check that a padding machine is absent before + logging a warning about it being absent. Fixes bug 30649; bugfix + on 0.4.0.1-alpha. - 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

1 0

[tor/release-0.4.0] Fix bugfix version in Bug 30649: Changes file.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 763fd0ad668cb03c11d9e3e932111152eea22630 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 2 11:38:05 2019 +0300 Fix bugfix version in Bug 30649: Changes file. --- changes/bug30649 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug30649 b/changes/bug30649 index 3f5768bcb..4b2c60317 100644 --- a/changes/bug30649 +++ b/changes/bug30649 @@ -1,4 +1,4 @@ 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 on 0.4.1.1-alpha. + bugfix on 0.4.0.1-alpha.

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1282' into release-0.4.1
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 40797bd3612477204c3cd459cc39021c5de71078 Merge: 51103450e 232202cc4 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 11:57:19 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1282' into release-0.4.1 ChangeLog | 2 +- ReleaseNotes | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Fix bugfix version in Bug 30649: Changes file.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 61082c059c83ef889eec00e8cddeda9a6367bee9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 2 11:38:05 2019 +0300 Fix bugfix version in Bug 30649: Changes file. --- changes/bug30649 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug30649 b/changes/bug30649 index 3f5768bcb..4b2c60317 100644 --- a/changes/bug30649 +++ b/changes/bug30649 @@ -1,4 +1,4 @@ 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 on 0.4.1.1-alpha. + bugfix on 0.4.0.1-alpha.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 9dd908e7138ecc4c26c7db2f1c1be4776499237d Merge: c08d3e46c 1203e137b Author: teor <teor(a)torproject.org> Date: Thu Sep 5 12:05:12 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/release-0.4.1] Merge commit '73890a86ef' into maint-0.4.1
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit c08d3e46ca72c61b11394c7fad5eebf82f48ca4f Merge: 630bb113a 73890a86e Author: teor <teor(a)torproject.org> Date: Thu Sep 5 11:52:52 2019 +1000 Merge commit '73890a86ef' into maint-0.4.1 tor-github/pr/1283, with the following changes: * cherry-pick the merge commit in 1283 on top of... * tor-github/pr/1174, but with the last commit re-worded to remove the fixup, because fixups break our push rules. This is an "ours" merge, except for the bugfix version change in changes/bug30649. changes/bug30649 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Fix bugfix version in Bug 30649: Changes file.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 763fd0ad668cb03c11d9e3e932111152eea22630 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 2 11:38:05 2019 +0300 Fix bugfix version in Bug 30649: Changes file. --- changes/bug30649 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug30649 b/changes/bug30649 index 3f5768bcb..4b2c60317 100644 --- a/changes/bug30649 +++ b/changes/bug30649 @@ -1,4 +1,4 @@ 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 on 0.4.1.1-alpha. + bugfix on 0.4.0.1-alpha.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 215c3eef81466415d40f5224ed02db4ca7d1b454 Merge: 40797bd36 9dd908e71 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 12:05:56 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 Resolved modified/deleted conflict on changes/bug30649 by deleting the file. tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of changes/bug30649.

1 0