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

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

29 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/maint-0.4.2] hs-v3: Remove BUG() that can occur normally
by nickm＠torproject.org 29 Jun '20

29 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/maint-0.3.5] hs-v3: Remove BUG() that can occur normally
by nickm＠torproject.org 29 Jun '20

29 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/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
by nickm＠torproject.org 29 Jun '20

29 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/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
by nickm＠torproject.org 29 Jun '20

29 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

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 0dd9daec05a843f24b768e2929e586a03122e856 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 15:46:59 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-PT.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index c757f4a176..7b018c78da 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -3,9 +3,9 @@ # Emma Peel, 2019 # erinm, 2020 # Rui <xymarior(a)yandex.com>, 2020 -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 # Hugo Costa <hugoncosta(a)gmail.com>, 2020 # A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2020 +# Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2020\n" +"Last-Translator: Manuela Silva <manuelarodsilva(a)gmail.com>, 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1137,7 +1137,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "Click \"Connect\" to save your settings." -msgstr "Carregue em \"Ligar\" para salvar a suas Configurações; Definições." +msgstr "Clique em \"Ligar\" para guardar a suas definições." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[translation/torcheck_completed] https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 85d8f807e2da2b37cfaf2f31f8a6b773f91b7970 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 15:17:43 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 72a14c773a..47d4a83e45 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-12-07 20:08+0000\n" +"PO-Revision-Date: 2020-06-29 14:55+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit d4594e1cee5db7277e837fbc1f7bc29e2ac17bf5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 15:17:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- fr/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 2311fec364..47d4a83e45 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -4,7 +4,7 @@ # Translators: # bassmax, 2013-2015 # AO <ao(a)localizationlab.org>, 2018-2019 -# arpalord <inactive+arpalord(a)transifex.com>, 2012 +# 4c6ce9952c5260c09c52a2847598402a_b451c51 <586e15927c43f46ef10f0dcb0660dbc3_11384>, 2012 # BitingBird <bitingbird(a)riseup.net>, 2014 # Emma Peel, 2019 # fanjoe <fanjoe(a)netcourrier.com>, 2014 @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-12-07 20:08+0000\n" +"PO-Revision-Date: 2020-06-29 14:55+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-and-https_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_completed
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 1b4b2e792c5f7464a58aef36e2aed73ba8431231 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 15:17:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_compl… --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index 21a7851fef..dc99424414 100644 --- a/fr.po +++ b/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2019-06-28 21:48+0000\n" +"PO-Revision-Date: 2020-06-29 14:55+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-and-https] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 9f492c7c5d67f1a6887088d1fa447be2ecd544d1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 15:17:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index 21a7851fef..dc99424414 100644 --- a/fr.po +++ b/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2019-06-28 21:48+0000\n" +"PO-Revision-Date: 2020-06-29 14:55+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0