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

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit ff5ebdcfc60956a21c47ae924fa2a9f5d245798a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 21:47:44 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- pt-BR/network-settings.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/pt-BR/network-settings.dtd b/pt-BR/network-settings.dtd index f4cc539af1..bff2a9fe8b 100644 --- a/pt-BR/network-settings.dtd +++ b/pt-BR/network-settings.dtd @@ -92,4 +92,5 @@ <!ENTITY torConnect.tryAgainMessage ""> <!ENTITY torConnect.connectingConcise ""> <!ENTITY torConnect.connectedConcise ""> +<!ENTITY torConnect.notConnectedConcise ""> <!ENTITY torConnect.copyLog "">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit b7fc3ec6768620a3e72ffd3fecec426a2dae9cf6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 21:47:42 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- pt-BR/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt-BR/network-settings.dtd b/pt-BR/network-settings.dtd index 86e8f4f5f7..c6174bb49b 100644 --- a/pt-BR/network-settings.dtd +++ b/pt-BR/network-settings.dtd @@ -92,5 +92,5 @@ <!ENTITY torConnect.tryAgainMessage "O navegador Tor não conseguiu estabelecer uma conexão com a rede Tor"> <!ENTITY torConnect.connectingConcise "Conectando..."> <!ENTITY torConnect.connectedConcise "Conectado"> -<!ENTITY torConnect.notConnectedConcise "Not Connected"> +<!ENTITY torConnect.notConnectedConcise "Não conectado"> <!ENTITY torConnect.copyLog "Copiar registros Tor">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit 14a022c26c16d5b7d87d3abdf71089e99304154c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 21:46:41 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2700a17b77..806da97903 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-07-22 20:55+0000\n" -"Last-Translator: José Ricardo dos Santos Júnior <hricardo2007(a)yandex.com>\n" +"PO-Revision-Date: 2021-07-23 21:30+0000\n" +"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit 30c63cd44b473227acd82e982d724a4b8b2799a7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 21:45:54 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index b0e9c29c42..ad96b04351 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-07-22 20:55+0000\n" -"Last-Translator: José Ricardo dos Santos Júnior <hricardo2007(a)yandex.com>\n" +"PO-Revision-Date: 2021-07-23 21:30+0000\n" +"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2601,7 +2601,7 @@ msgid "" "\n" "To request obfs4 bridges, you can send an empty email to\n" "<tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" -msgstr "" +msgstr "Atualmente no Tails, apenas as pontes obfs4 escondem que você está usando o Tor.\n\nAs pontes obfs4 começam com a palavra 'obfs4'.\n\nPara solicitar pontes obfs4, você pode enviar um e-mail vazio para\n<tt>bridges(a)torproject.org</tt> de um endereço de e-mail do Gmail ou Riseup.\n" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:702

1 0

[translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit 00591264ae5fbaf83e8bc3dba5ff2dabf45228a8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 20:17:50 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- uk/torlauncher.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uk/torlauncher.properties b/uk/torlauncher.properties index e77f00e09f..16a8e36ccb 100644 --- a/uk/torlauncher.properties +++ b/uk/torlauncher.properties @@ -93,3 +93,5 @@ # torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. # torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. # torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. + +# torlauncher.copiedNLogMessagesShort=Copied %S Logs

1 0

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit fc1914782c499a83ebb38ededfe1367b1cbfe9a3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 20:17:48 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- uk/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/torlauncher.properties b/uk/torlauncher.properties index 8bccc257ee..fe552fb2f6 100644 --- a/uk/torlauncher.properties +++ b/uk/torlauncher.properties @@ -94,4 +94,4 @@ torlauncher.nsresult.NS_ERROR_NET_RESET=З'єднання з сервером в torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не вдалося з'єднатися з сервером. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не вдалося з'єднатися з проксі-сервером. -torlauncher.copiedNLogMessagesShort=Copied %S Logs +torlauncher.copiedNLogMessagesShort=Скопійовано %S логів

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit 9a3f537f0703d6ef5821bad6945538f22554af5f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 20:17:28 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- uk/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/torbutton.properties b/uk/torbutton.properties index 75f6dae2c9..ea989a5cd0 100644 --- a/uk/torbutton.properties +++ b/uk/torbutton.properties @@ -152,5 +152,5 @@ cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to es cryptoSafetyPrompt.learnMore=Дізнатися більше cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit cryptoSafetyPrompt.primaryActionAccessKey=R -cryptoSafetyPrompt.secondaryAction=Dismiss Warning +cryptoSafetyPrompt.secondaryAction=Відхилити попередження cryptoSafetyPrompt.secondaryActionAccessKey=б

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit e56e5a5699fc64315b2e263cfb1603b7000d7326 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 20:15:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- uk/messages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk/messages.json b/uk/messages.json index 2ddfd0b011..40b24dc394 100644 --- a/uk/messages.json +++ b/uk/messages.json @@ -39,13 +39,13 @@ "message": "Snowflake — система, що дозволяє перемогти цензуру в інтернеті. Люди, які піддаються цензурі в інтернеті, зможуть використовувати Snowflake для доступу до інтернету. Їх з'єднання проходить через проксі Snowflake, якими керують волонтери. Для більш детальної інформації про роботу Snowflake дивіться нашу <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">вікі-документацію</a>." }, "browser": { - "message": "Use Snowflake" + "message": "Використовувати Snowflake" }, "censoredUsers": { "message": "Якщо ваш інтернет під цензурою, тоді вам потрібно завантажити <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." }, "extension": { - "message": "Run a Proxy" + "message": "Запустити проксі" }, "installExtension": { "message": "Якщо ваш інтернет <strong>не</strong> піддається цензурі, тоді ви можете встановити розширення Snowflake, щоб допомогти користувачам у цензурованих мережах. Не хвилюйтеся про сайти, які люди відвідуватимуть через ваш проксі. Їхня видима IP-адреса відповідатиме їхньому вихідному вузлу Tor, не вашому."

1 0

[tor/main] circpad: Be smarter on when to send back STOP cells.
by nickm＠torproject.org 23 Jul '21

23 Jul '21

commit 72aa23a9fd1772de214ea8a22e1371c2d026dc7c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 22 15:02:13 2021 +0300 circpad: Be smarter on when to send back STOP cells. --- changes/bug40435 | 4 ++++ src/core/or/circuitpadding.c | 19 +++++++++++++++---- src/test/test_circuitpadding.c | 6 ++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/changes/bug40435 b/changes/bug40435 new file mode 100644 index 0000000000..76d0a687eb --- /dev/null +++ b/changes/bug40435 @@ -0,0 +1,4 @@ + o Minor bugfixes (circuit padding): + - Don't send STOP circuit padding cells when the other side has already + shut down the corresponding padding machine. Fixes bug 40435; bugfix on + 0.4.0.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 6dfe94de01..99dc5f9d83 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2967,6 +2967,8 @@ signed_error_t circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) { int retval = 0; + /* Should we send back a STOP cell? */ + bool respond_with_stop = true; circpad_negotiate_t *negotiate; if (CIRCUIT_IS_ORIGIN(circ)) { @@ -2992,6 +2994,12 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) negotiate->machine_type, negotiate->machine_ctr); goto done; } + + /* If we reached this point we received a STOP command from an old or + unknown machine. Don't reply with our own STOP since there is no one to + handle it on the other end */ + respond_with_stop = false; + if (negotiate->machine_ctr <= circ->padding_machine_ctr) { log_info(LD_CIRC, "Received STOP command for old machine %u, ctr %u", negotiate->machine_type, negotiate->machine_ctr); @@ -3023,10 +3031,13 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) retval = -1; done: - circpad_padding_negotiated(circ, negotiate->machine_type, - negotiate->command, - (retval == 0) ? CIRCPAD_RESPONSE_OK : CIRCPAD_RESPONSE_ERR, - negotiate->machine_ctr); + if (respond_with_stop) { + circpad_padding_negotiated(circ, negotiate->machine_type, + negotiate->command, + (retval == 0) ? CIRCPAD_RESPONSE_OK : CIRCPAD_RESPONSE_ERR, + negotiate->machine_ctr); + } + circpad_negotiate_free(negotiate); return retval; diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 86baf54f40..6ced3f4111 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1367,7 +1367,7 @@ test_circuitpadding_wronghop(void *arg) tt_ptr_op(client_side->padding_info[0], OP_NE, NULL); tt_ptr_op(relay_side->padding_machine[0], OP_NE, NULL); tt_ptr_op(relay_side->padding_info[0], OP_NE, NULL); - tt_int_op(n_relay_cells, OP_EQ, 3); + tt_int_op(n_relay_cells, OP_EQ, 2); tt_int_op(n_client_cells, OP_EQ, 2); /* 6. Sending negotiated command to relay does nothing */ @@ -1396,11 +1396,9 @@ test_circuitpadding_wronghop(void *arg) /* verify no padding was negotiated */ tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL); tt_ptr_op(client_side->padding_machine[0], OP_EQ, NULL); - tt_int_op(n_relay_cells, OP_EQ, 3); - tt_int_op(n_client_cells, OP_EQ, 2); /* verify no echo was sent */ - tt_int_op(n_relay_cells, OP_EQ, 3); + tt_int_op(n_relay_cells, OP_EQ, 2); tt_int_op(n_client_cells, OP_EQ, 2); /* Finish circuit */

1 0

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/412'
by nickm＠torproject.org 23 Jul '21

23 Jul '21

commit a9b287fbcc45ac5825599d42b3c024d4b8a88782 Merge: bc40c6af08 72aa23a9fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 23 15:06:06 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/412' changes/bug40435 | 4 ++++ src/core/or/circuitpadding.c | 19 +++++++++++++++---- src/test/test_circuitpadding.c | 6 ++---- 3 files changed, 21 insertions(+), 8 deletions(-)

1 0