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

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 2d4772dc47e6e7c43c3909540e73a139333fc7d6 Merge: ef345ab56 8c4e68438 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:43:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5 changes/bug30190 | 3 +++ src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 6ed56ee4eaf679d4352d034af5951d36fc9a6f8e Merge: 2d4772dc4 802ac8ad6 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:44:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5 changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit d253b31cec04c35c551618b9b1ffa50ae4426303 Merge: 31fb2bceb a6399da59 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:54:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5 changes/bug29034 | 5 +++++ src/core/or/circuituse.c | 6 ++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 20943d00f10af11133d9ece90f1cbed658a21aed Merge: a1d8409ee d253b31ce Author: teor <teor(a)torproject.org> Date: Mon Aug 12 13:10:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug22619 | 3 +++ changes/bug29034 | 5 +++++ changes/bug29670 | 4 ++++ changes/bug29875 | 11 +++++++++++ changes/bug30148 | 4 ++++ changes/bug30190 | 3 +++ changes/ticket29617 | 4 ++++ src/app/config/config.c | 5 +++-- src/core/mainloop/connection.c | 33 +++++++++++++++++++++------------ src/core/or/circuituse.c | 6 ++++++ src/feature/client/entrynodes.c | 3 +++ src/feature/relay/dns.c | 3 ++- src/feature/relay/routerkeys.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ src/test/test_config.c | 12 +++++------- 15 files changed, 83 insertions(+), 23 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 31fb2bceb546fb84899e5c797e3f101b86dd8687 Merge: 789fdbed0 c09e7a4e7 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:53:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5 changes/bug29875 | 11 +++++++++++ src/app/config/config.c | 3 ++- src/feature/client/entrynodes.c | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit a1d8409ee28b609a7d6a1a138a53628cb214a113 Merge: bad001080 bdf685e47 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:55:29 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0 changes/bug30614 | 4 ++++ src/lib/malloc/map_anon.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit a92b05392e2e88357b0e2a1c31cfdb7e94406838 Merge: 224825e7e 5cbd71b97 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:51:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5 changes/bug29670 | 4 ++++ src/core/mainloop/connection.c | 33 +++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 789fdbed0586aeec5b312195a453c9ddaf8d58be Merge: a92b05392 3c3158f18 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:52:56 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5 changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +++++------- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.4.0] Bug 29034: Cleanup hs circuitmap when purpose changes.
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit a6399da598101d8046cbf7ab2d80051fd8820e2f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 11:50:44 2019 -0700 Bug 29034: Cleanup hs circuitmap when purpose changes. Leave the other rend and hs_ident data around until circuit free, since code may still try to inspect it after marking the circuit for close. The circuitmap is the important thing to clean up, since repurposed intropoints must be removed from this map to ensure validity. --- changes/bug29034 | 5 +++++ src/core/or/circuituse.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug29034 b/changes/bug29034 new file mode 100644 index 000000000..e7aa9af00 --- /dev/null +++ b/changes/bug29034 @@ -0,0 +1,5 @@ + o Major bugfixes (Onion service reachability): + - Properly clean up the introduction point map when circuits change purpose + from onion service circuits to pathbias, measurement, or other circuit types. + This should fix some service-side instances of introduction point failure. + Fixes bug 29034; bugfix on 0.3.2.1-alpha. diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 02bfa15fb..000a7c36d 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -3066,6 +3066,12 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) circ->purpose, circuit_purpose_to_string(new_purpose), new_purpose); + + /* Take specific actions if we are repurposing a hidden service circuit. */ + if (circuit_purpose_is_hidden_service(circ->purpose) && + !circuit_purpose_is_hidden_service(new_purpose)) { + hs_circ_cleanup(circ); + } } old_purpose = circ->purpose;

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 955cf9620c68c17f6531e80f9f4a7fa7d9f0f479 Merge: 3287cae68 4dd96f744 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:40:08 2019 +1000 Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5 changes/29241_diagnostic | 4 ++++ changes/bug29241 | 6 ++++++ src/lib/tls/tortls_nss.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+)

1 0