June 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit 183d0d30d66aaae058cd180292779d770182ef80 Merge: 272c17113 fd8ce812b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit fd8ce812b0a7263b75096207a735c02945320c86 Merge: 0f218a05a 0c0214bcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit 2c61f22e438d5ba13ace278af5c9c1005dde58f1 Merge: 68d848e24 183d0d30d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit c2843f9fe4f6c0838058d620d841258d659f834c Merge: f1932265f 2c61f22e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit 0c0214bcc08e85040e8eb12f8388a45d271a6918 Merge: 6a43aadec 88489cd29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5 changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] hs-v3: Remove BUG() that can occur normally
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit 88489cd29006f093e1a5572711b26ee1b057e359 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 4 10:13:10 2020 -0500 hs-v3: Remove BUG() that can occur normally Fixes #28992 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/changes/ticket28992 b/changes/ticket28992 new file mode 100644 index 000000000..3e45d73e4 --- /dev/null +++ b/changes/ticket28992 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service v3, client): + - Remove a BUG() that is causing a stacktrace for a situation that very + rarely happens but still can. Fixes bug 28992; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index fd2d26645..b045e1899 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -596,9 +596,14 @@ send_introduce1(origin_circuit_t *intro_circ, /* We need to find which intro point in the descriptor we are connected to * on intro_circ. */ ip = find_desc_intro_point_by_ident(intro_circ->hs_ident, desc); - if (BUG(ip == NULL)) { - /* If we can find a descriptor from this introduction circuit ident, we - * must have a valid intro point object. Permanent error. */ + if (ip == NULL) { + /* The following is possible if the descriptor was changed while we had + * this introduction circuit open and waiting for the rendezvous circuit to + * be ready. Which results in this situation where we can't find the + * corresponding intro point within the descriptor of the service. */ + log_info(LD_REND, "Unable to find introduction point for service %s " + "while trying to send an INTRODUCE1 cell.", + safe_str_client(onion_address)); goto perm_err; }

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit b31086201178c954e4d300273bbc7c7f5d4d6a8a Merge: 9c217cd47 0c0214bcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit fd8ce812b0a7263b75096207a735c02945320c86 Merge: 0f218a05a 0c0214bcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit 183d0d30d66aaae058cd180292779d770182ef80 Merge: 272c17113 fd8ce812b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
by nickm＠torproject.org 30 Jun '20

30 Jun '20

commit 0c0214bcc08e85040e8eb12f8388a45d271a6918 Merge: 6a43aadec 88489cd29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 12:55:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5 changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0