tor-commits July 2021

tor-commits@lists.torproject.org

17 participants
1544 discussions

[tor/release-0.4.6] hs: Send back 0xF6 for a v2 onion address
by asn＠torproject.org 07 Jul '21

07 Jul '21

commit 301ffb71a695e89f2e4905e2260fce15439259f1 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 29 09:56:44 2021 -0400 hs: Send back 0xF6 for a v2 onion address Fixes #40421 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40421 | 3 +++ src/core/or/connection_edge.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/changes/ticket40421 b/changes/ticket40421 new file mode 100644 index 0000000000..d2dcc5533d --- /dev/null +++ b/changes/ticket40421 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service): + - Send back the extended SOCKS error 0xF6 for a v2 onion address. Fixes bug + 40421; bugfix on 0.4.6.2-alpha. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index a307249967..6f6f22a0d4 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2536,6 +2536,10 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, "https://blog.torproject.org/v2-deprecation-timeline."); control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); + /* Send back the 0xF6 extended code indicating a bad hostname. This is + * mostly so Tor Browser can make a proper UX with regards to v2 + * addresses. */ + conn->socks_request->socks_extended_error_code = SOCKS5_HS_BAD_ADDRESS; connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); return -1; }

1 0

[tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6
by asn＠torproject.org 07 Jul '21

07 Jul '21

commit 8b026b4eeef1cb3de672d120dfa2018c9ce67f0d Merge: a522aabd3b 301ffb71a6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 7 13:04:24 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6 changes/ticket40421 | 3 +++ src/core/or/connection_edge.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by asn＠torproject.org 07 Jul '21

07 Jul '21

commit cb9e3466188aae17e08844ac5a193a35b07edba3 Merge: d89bffb8c7 8b026b4eee Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 7 13:04:39 2021 +0300 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40421 | 3 +++ src/core/or/connection_edge.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

[tor/main] hs: Send back 0xF6 for a v2 onion address
by asn＠torproject.org 07 Jul '21

07 Jul '21

1 0

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/406'
by asn＠torproject.org 07 Jul '21

07 Jul '21

commit e79d73de9b2f94bebc87166ed86d00b4b3295010 Merge: 8949317ecc 301ffb71a6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 7 13:02:11 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/406' changes/ticket40421 | 3 +++ src/core/or/connection_edge.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

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

07 Jul '21

commit abbdf0fc0bd608d2c3e45232fe897b869d2a6ebb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 03:16:27 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.po b/ja.po index 0d03a48e35..568c60434b 100644 --- a/ja.po +++ b/ja.po @@ -34,7 +34,7 @@ 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-07 02:45+0000\n" +"PO-Revision-Date: 2021-07-07 02:48+0000\n" "Last-Translator: Kaede\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Jul '21

commit e1a2ca29266e03e1ec4040dc42b4c0e783a1ce7b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 03:15:46 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ja.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ja.po b/ja.po index 0504f3a323..aa75440fdc 100644 --- a/ja.po +++ b/ja.po @@ -34,7 +34,7 @@ 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-07 02:45+0000\n" +"PO-Revision-Date: 2021-07-07 02:48+0000\n" "Last-Translator: Kaede\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -2718,11 +2718,11 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1213 msgid "Open Wi-Fi settings" -msgstr "" +msgstr "Wi-Fi の設定を開く" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1262 msgid "Testing Internet access…" -msgstr "インターネットへの接続状況を確認中…" +msgstr "インターネットへの接続を確認中…" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1302 msgid "You have access to the Internet" @@ -2730,7 +2730,7 @@ msgstr "インターネットにアクセスできます" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1336 msgid "Testing access to Tor…" -msgstr "" +msgstr "Tor への接続を確認中…" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1379 msgid "You can connect to Tor"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 07 Jul '21

07 Jul '21

commit 6972f5656c3ed75989485e429a1bbed173f4fe65 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 02:47:41 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index a035974f94..356dd2e3ee 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -668,7 +668,7 @@ msgid "" "release, [please let us know](https://support.torproject.org/misc/bug-or-" "feedback/)." msgstr "" -"თუ იპოვნით ხარვეზს ან გექნებათ შემოთავაზება, როგორ გავაუმჯობესოთ გამოშვება, " +"თუ იპოვით ხარვეზს ან გექნებათ შემოთავაზება, როგორ გავაუმჯობესოთ გამოშვება, " "[გთხოვთ გვაცნობოთ](https://support.torproject.org/misc/bug-or-feedback/)." #: https//www.torproject.org/releases/tor-browser-95/ @@ -679,8 +679,8 @@ msgid "" "Thanks to all of the teams across Tor, and the many volunteers, who " "contributed to this release." msgstr "" -"გმადლობთ Tor-ზე მომუშავე თითოეულ გუნდსა და უამრავ მოსახლისეს, ამ გამოშვებაში" -" წვლილის შეტანისთვის." +"გმადლობთ Tor-ზე მომუშავე თითოეულ გუნდსა და უამრავ მოხალისეს, ამ გამოშვებაში " +"წვლილის შეტანისთვის." #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.title)

1 0

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

07 Jul '21

commit 23eea2d7dd2f680203fcbe86e9c5384e5ec44359 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 02:47:37 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ja/network-settings.dtd | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index b0d38062a7..69249ed667 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -66,6 +66,9 @@ <!ENTITY torPreferences.torSettings ""> <!ENTITY torPreferences.torSettingsDescription "" > <!ENTITY torPreferences.learnMore ""> +<!ENTITY torPreferences.quickstart ""> +<!ENTITY torPreferences.quickstartDescription ""> +<!ENTITY torPreferences.quickstartCheckbox ""> <!ENTITY torPreferences.bridges ""> <!ENTITY torPreferences.bridgesDescription ""> <!ENTITY torPreferences.useBridge ""> @@ -81,3 +84,12 @@ <!ENTITY torPreferences.viewTorLogs ""> <!ENTITY torPreferences.viewLogs ""> <!ENTITY torPreferences.torLogsDialogTitle ""> + + +<!ENTITY torConnect.tryAgain ""> +<!ENTITY torConnect.offline ""> +<!ENTITY torConnect.connectMessage ""> +<!ENTITY torConnect.tryAgainMessage ""> +<!ENTITY torConnect.connectingConcise ""> +<!ENTITY torConnect.connectedConcise ""> +<!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 07 Jul '21

07 Jul '21

commit df1ccd10e3fabedbc5481a29830fbbf81048bd11 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 7 02:47:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ja/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 7c2f2c33b7..8c85e1ccbc 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -66,9 +66,9 @@ <!ENTITY torPreferences.torSettings "Tor の設定"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser は通信トラフィックを Tor ネットワークを経由させて送信します。Tor ネットワークは世界中の何千ものボランティアによって運用されています。" > <!ENTITY torPreferences.learnMore "詳細情報"> -<!ENTITY torPreferences.quickstart "Quickstart"> -<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically."> -<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically"> +<!ENTITY torPreferences.quickstart "クイックスタート"> +<!ENTITY torPreferences.quickstartDescription "クイックスタートを有効にすると、Tor Browser は自動的に接続を行います。"> +<!ENTITY torPreferences.quickstartCheckbox "常に自動的に接続"> <!ENTITY torPreferences.bridges "Bridge"> <!ENTITY torPreferences.bridgesDescription "Bridge は Tor がブロックされる地域から Tor ネットワークにアクセスすることを手助けします。地域によって、ある Bridge が他のものよりうまく動作する可能性があります。"> <!ENTITY torPreferences.useBridge "Bridge を使用する"> @@ -88,8 +88,8 @@  <!ENTITY torConnect.tryAgain "再度接続を試す"> <!ENTITY torConnect.offline "オフライン"> -<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect to the Tor Network"> -<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> +<!ENTITY torConnect.connectMessage "Tor の設定の変更は、Tor ネットワークに接続するまで反映されません"> +<!ENTITY torConnect.tryAgainMessage "Tor Browser は、Tor ネットワークへの接続を確立できませんでした"> <!ENTITY torConnect.connectingConcise "接続中…"> <!ENTITY torConnect.connectedConcise "接続済み"> <!ENTITY torConnect.copyLog "Tor ログをコピー">

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2021