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

[chutney/master] Add back bwscanner files
by nickm＠torproject.org 08 Mar '21

08 Mar '21

commit 55867eef079bb24f6898019d9fe1fe7f17e1a908 Author: juga <juga(a)riseup.net> Date: Fri Mar 5 12:11:14 2021 +0000 Add back bwscanner files because sbws is now using chutney and it would be better the files are maintained as part of chutney. This will also help to reproduce #40013 . --- networks/bwscanner | 20 ++++++++++++++++++++ torrc_templates/client_bwscanner.tmpl | 12 ++++++++++++ torrc_templates/relay-MAB.tmpl | 4 ++++ torrc_templates/relay-MBR.tmpl | 4 ++++ 4 files changed, 40 insertions(+) diff --git a/networks/bwscanner b/networks/bwscanner new file mode 100644 index 0000000..86f8c78 --- /dev/null +++ b/networks/bwscanner @@ -0,0 +1,20 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +# #40013: All the relays get the EXIT flag +# The relay-non-exit.tmpl includes the relay-non-dir.tmpl, which includdes +# `${include:common.i} ExitRelay=0` and common.i generates a torrc file with +# ExitRelay 0 +# ExitRelay 0 +# ExitPolicy reject *:* +NonExitRelay = Node(tag="m", relay=1, exit=0, torrc="relay-non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl") +RelayMAB = Node(tag="relay1mbyteMAB", relay=1, exit=1, torrc="relay-MAB.tmpl") +RelayMBR = Node(tag="relay1mbyteMBR", relay=1, exit=1, torrc="relay-MBR.tmpl") + +NODES = Authority.getN(3) + \ + NonExitRelay.getN(7) + \ + RelayMBR.getN(1) + RelayMAB.getN(1) + \ + ExitRelay.getN(3) + Client.getN(1) + +ConfigureNodes(NODES) diff --git a/torrc_templates/client_bwscanner.tmpl b/torrc_templates/client_bwscanner.tmpl new file mode 100644 index 0000000..1c0358a --- /dev/null +++ b/torrc_templates/client_bwscanner.tmpl @@ -0,0 +1,12 @@ +${include:common.i} +SocksPort $socksport +UseEntryGuards 0 +UseMicroDescriptors 0 +FetchDirInfoEarly 1 +FetchDirInfoExtraEarly 1 +FetchUselessDescriptors 1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +ConnectionPadding 0 +__DisablePredictedCircuits 1 +__LeaveStreamsUnattached 1 diff --git a/torrc_templates/relay-MAB.tmpl b/torrc_templates/relay-MAB.tmpl new file mode 100644 index 0000000..c53d242 --- /dev/null +++ b/torrc_templates/relay-MAB.tmpl @@ -0,0 +1,4 @@ +${include:relay-non-exit.tmpl} + +Nickname relay1mbyteMAB +MaxAdvertisedBandwidth 1 MBytes diff --git a/torrc_templates/relay-MBR.tmpl b/torrc_templates/relay-MBR.tmpl new file mode 100644 index 0000000..a159524 --- /dev/null +++ b/torrc_templates/relay-MBR.tmpl @@ -0,0 +1,4 @@ +${include:relay-non-exit.tmpl} + +Nickname relay1mbyteMBR +RelayBandwidthRate 1 MBytes

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Mar '21

08 Mar '21

commit 6f13ec37129e2acb397e82b4bb821047f7b5c040 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 8 14:18:39 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 5c7dc215ad..3a3abf74bd 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -6160,6 +6160,10 @@ msgid "" "same steps as in [Tor Browser for Android](https://tb-manual.torproject.org" "/mobile-tor/#tor-browser-for-android) can be followed." msgstr "" +"لا توجد حاليًا طريقة مدعومة لتشغيل متصفح Tor على هواتف ويندوز الأقدم ، ولكن " +"في حالة الهواتف الأحدث التي تحمل علامة مايكروسوفت التجارية / التي تم الترويج" +" لها ، نفس الخطوات كما في [متصفح Tor لنظام الاندرويد] (https://tb-" +"manual.torproject.org/ mobile-tor / # tor-browser-for-android) يمكن اتباعها." #: https//support.torproject.org/tormobile/tormobile-5/ #: (content/tormobile/tormobile-5/contents+en.lrquestion.title) @@ -6723,12 +6727,12 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-4/ #: (content/connecting/connecting-4/contents+en.lrquestion.title) msgid "\"Proxy server is refusing connection\" error" -msgstr "" +msgstr "خطأ \"خادم البروكسي يرفض الاتصال\"" #: https//support.torproject.org/connecting/connecting-4/ #: (content/connecting/connecting-4/contents+en.lrquestion.description) msgid "Proxy server errors can occur for a variety of reasons." -msgstr "" +msgstr "يمكن أن تحدث أخطاء خادم البروكسي لعدة أسباب." #: https//support.torproject.org/connecting/connecting-4/ #: (content/connecting/connecting-4/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 08 Mar '21

08 Mar '21

commit 889b414e671c6a7541c792edb4a3dc40f3a39870 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 8 09:17:07 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ja.po | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 3832a24010..03b6cfa518 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -3268,6 +3268,9 @@ msgid "" "[#31814](https://gitlab.torproject.org/tpo/applications/tor-" "browser/-/issues/31814)" msgstr "" +"* SD カードに移動した時、Android 用 Tor Browser " +"は接続できません。[#31814](https://gitlab.torproject.org/tpo/applications/tor-" +"browser/-/issues/31814)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3374,7 +3377,7 @@ msgstr "### iOS 用 Tor Browser" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "There is no Tor Browser for iOS." -msgstr "iOS 用の Tor Browser はありません。" +msgstr "iOS 用 Tor Browser はありません。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3400,7 +3403,7 @@ msgid "" "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-" "onion-browser-and-more-ios-tor)." msgstr "" -"[Onion Browserについての詳細](https://blog.torproject.org/tor-heart-onion-browser-" +"[Onion Browser についての詳細](https://blog.torproject.org/tor-heart-onion-browser-" "and-more-ios-tor)." #: https//tb-manual.torproject.org/mobile-tor/ @@ -3409,8 +3412,8 @@ msgid "" "Download Onion Browser from the [App Store](https://itunes.apple.com/us/app" "/onion-browser/id519296448)." msgstr "" -"[App Store](https://itunes.apple.com/us/app/onion-" -"browser/id519296448)からOnion Browserをダウンロードします。" +"[App Store](https://itunes.apple.com/us/app/onion-browser/id519296448) から " +"Onion Browser をダウンロードします。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -3428,12 +3431,12 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title) msgid "MAKE TOR BROWSER PORTABLE" -msgstr "Tor ブラウザをポータブルにしよう" +msgstr "Tor Browser をポータブルにする" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.description) msgid "How to install Tor Browser onto removable media" -msgstr "Tor ブラウザをリムーバブルメディアへインストールする方法" +msgstr "Tor Browser をリムーバブルメディアへインストールする方法" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Mar '21

08 Mar '21

commit 9f85b0c8c24d1034e95ee111cbe4173e5b586251 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 8 08:48:31 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index ca8a12e8da..8e2747e0fe 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -281,7 +281,7 @@ msgstr "" #: https//support.torproject.org/glossary/bridge-authority/ #: (content/glossary/bridge-authority/contents+en.lrword.term) msgid "bridge authority" -msgstr "" +msgstr "ブリッジ権限" #: https//support.torproject.org/glossary/bridge-authority/ #: (content/glossary/bridge-authority/contents+en.lrword.definition) @@ -292,7 +292,7 @@ msgstr "" #: https//support.torproject.org/glossary/browser-fingerprinting/ #: (content/glossary/browser-fingerprinting/contents+en.lrword.term) msgid "browser fingerprinting" -msgstr "ブラウザフィンガープリント" +msgstr "ブラウザーのフィンガープリント" #: https//support.torproject.org/glossary/browser-fingerprinting/ #: (content/glossary/browser-fingerprinting/contents+en.lrword.definition) @@ -357,7 +357,7 @@ msgstr "" #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.spelling) msgid "Only capitalize first letter, as Captcha is now considered a noun" -msgstr "" +msgstr "Captha は現在、名詞とみなされているため最初の文字が大文字となっています。" #: https//support.torproject.org/glossary/checksum/ #: (content/glossary/checksum/contents+en.lrword.term) @@ -433,7 +433,7 @@ msgstr "" #: https//support.torproject.org/glossary/cookie/ #: (content/glossary/cookie/contents+en.lrword.term) msgid "cookie" -msgstr "クッキー" +msgstr "Cookie" #: https//support.torproject.org/glossary/cookie/ #: (content/glossary/cookie/contents+en.lrword.definition) @@ -580,8 +580,8 @@ msgid "" "developed by the Mozilla Foundation and its subsidiary, the Mozilla " "Corporation." msgstr "" -"Mozilla Firefox はMozilla Foundationの子会社であるMozilla " -"Corporationが開発する無料でオープンソースの[ウェブブラウザ](../web-browser)です。" +"Mozilla Firefox は Mozilla Foundation の子会社である Mozilla Corporation " +"が開発する無料でオープンソースの [Web ブラウザー](../web-browser)です。" #: https//support.torproject.org/glossary/firefox/ #: (content/glossary/firefox/contents+en.lrword.definition)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Mar '21

08 Mar '21

commit c5e7f932121622cfff95622a4f3282ee8a277cf6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 8 08:18:04 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 5972b07889..ca8a12e8da 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -114,7 +114,7 @@ msgstr "オペレーター" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Onion Services" -msgstr "オニオンサービス" +msgstr "Onion サービス" #: https//support.torproject.org/misc/ #: (content/misc/contents+en.lrtopic.title) @@ -163,7 +163,7 @@ msgid "" "Add-ons, extensions, and plugins are components that can be added to [web " "browsers](../web-browser) to give them new features." msgstr "" -"アドオン、拡張機能、プラグインは、[ウェブブラウザ](../web-browser)などにインストールすることで何らかの機能を提供する追加要素です。" +"アドオン、拡張機能、プラグインは、[Web ブラウザー](../web-browser)などにインストールすることで何らかの機能を提供する追加要素です。" #: https//support.torproject.org/glossary/add-on-extension-or-plugin/ #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.definition) @@ -199,6 +199,7 @@ msgid "" "Antivirus software can interfere with [Tor](../tor-tor-network-core-tor) " "running on your computer." msgstr "" +"アンチウイルスソフトウェアはコンピューター上で [Tor](../tor-tor-network-core-tor) と干渉することがあります。" #: https//support.torproject.org/glossary/antivirus-software/ #: (content/glossary/antivirus-software/contents+en.lrword.definition) @@ -247,7 +248,7 @@ msgstr "Atlas は現在動作中の [Tor リレー](../relay)に関する情報 #: https//support.torproject.org/glossary/bandwidth-authority/ #: (content/glossary/bandwidth-authority/contents+en.lrword.term) msgid "bandwidth authority" -msgstr "" +msgstr "帯域幅権限" #: https//support.torproject.org/glossary/bandwidth-authority/ #: (content/glossary/bandwidth-authority/contents+en.lrword.definition)

1 0

[gettor/master] Treat all email sending exceptions the same
by cohosh＠torproject.org 07 Mar '21

07 Mar '21

commit fc9e1ed212d54cf682601a1caaa7e289a43d50cf Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Sun Mar 7 19:15:21 2021 -0500 Treat all email sending exceptions the same In the previous commit, we forgot to remove requests that trigger exceptions other than SMTPClientError. --- gettor/services/email/sendmail.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 869373d..9c703f3 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -230,14 +230,9 @@ class Sendmail(object): id=id, service="email", date=date ) - except smtp.SMTPClientError as e: + except Exception as e: yield self.conn.remove_request( id=id, service="email", date=date ) log.error(strings.redact_emails( "Error sending email to {}:{}.".format(id, e))) - - except Exception as e: - log.error( - strings.redact_emails("Error sending email:{}.".format(e)) - )

1 0

[gettor/master] fix minor spelling error
by cohosh＠torproject.org 07 Mar '21

07 Mar '21

commit dd2818ee27b8e0e9c08d34ef864a5168d10e0e0b Author: hanneloresx <hanneloresx(a)protonmail.com> Date: Sat Jan 23 17:46:20 2021 -0500 fix minor spelling error --- gettor/utils/validate_email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/utils/validate_email.py b/gettor/utils/validate_email.py index 337849e..9537c84 100644 --- a/gettor/utils/validate_email.py +++ b/gettor/utils/validate_email.py @@ -170,7 +170,7 @@ def validate_email(email, check_mx=False, verify=False, debug=False, smtp_timeou smtp.quit() except smtplib.SMTPServerDisconnected: # Server not permits verify user if debug: - logger.debug(u'%s disconected.', mx[1]) + logger.debug(u'%s disconnected.', mx[1]) except smtplib.SMTPConnectError: if debug: logger.debug(u'Unable to connect to %s.', mx[1])

1 0

[gettor/master] Redact email addr from error msgs
by cohosh＠torproject.org 07 Mar '21

07 Mar '21

commit ae30ca5e2288efd083ebe112dc9628aeb5fce4f8 Author: hanneloresx <hanneloresx(a)protonmail.com> Date: Sat Jan 23 17:56:08 2021 -0500 Redact email addr from error msgs Addresses issue #34058 to scrub logs of personal info. --- gettor/services/email/sendmail.py | 8 ++++++-- gettor/utils/strings.py | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index a877ede..96113eb 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -235,7 +235,11 @@ class Sendmail(object): yield self.conn.remove_request( id=id, service="email", date=date ) - log.error("Error sending email: {}.".format(e)) + log.error( + strings.redact_emails("Error sending email:{}.".format(e)) + ) except Exception as e: - log.error("Error sending email: {}.".format(e)) + log.error( + strings.redact_emails("Error sending email:{}.".format(e)) + ) diff --git a/gettor/utils/strings.py b/gettor/utils/strings.py index 2471ef5..f68583f 100644 --- a/gettor/utils/strings.py +++ b/gettor/utils/strings.py @@ -13,6 +13,7 @@ the Tor Browser. import json import os import inspect +import re strings = {} translations = {} @@ -115,6 +116,10 @@ def load_strings(current_locale): strings[s] = translations[current_locale][s] +def redact_emails(text): + redacted_text = re.sub(r'[\w\.+-]+(a)[\w\.+-]+', '[REDACTED_EMAIL]', text) + return redacted_text + def translated(k): """

1 0

[gettor/master] Remove all requests that cause exceptions from db
by cohosh＠torproject.org 07 Mar '21

07 Mar '21

commit 80371ae66a6c62e1a1d18e5fd123729925a88b4d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Sun Mar 7 19:09:06 2021 -0500 Remove all requests that cause exceptions from db This solves gettor#77 where a non-ascii email address was causing our SMTP client to throw an error. We need to remove the request from the database in order to move on and process the rest of the requests. --- gettor/services/email/sendmail.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 96113eb..869373d 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -231,13 +231,11 @@ class Sendmail(object): ) except smtp.SMTPClientError as e: - if e.code == 501: # Bad recipient address syntax - yield self.conn.remove_request( - id=id, service="email", date=date - ) - log.error( - strings.redact_emails("Error sending email:{}.".format(e)) - ) + yield self.conn.remove_request( + id=id, service="email", date=date + ) + log.error(strings.redact_emails( + "Error sending email to {}:{}.".format(id, e))) except Exception as e: log.error(

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 07 Mar '21

07 Mar '21

commit 844c402b3892bd7d1620149f7ccd99df7df81e77 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 7 17:47:18 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- de/torcheck.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index e461f9f3f4..7c15eb4cb7 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -6,7 +6,7 @@ # 6d25b80fec81ca71e437a2d9e8d212de, 2014 # axcer <axcer(a)gmx.de>, 2014 # axcer <axcer(a)gmx.de>, 2014 -# Christian Kaindl <crisscross.kaindl(a)outlook.de>, 2015 +# dd5d3860738f3af12994bfe3d497598e_528d6d9 <2495ffd653c87b80c8a835d4f68e20eb_358302>, 2015 # Frank Anonima <franka1234(a)yandex.com>, 2015 # gerhard <listmember(a)rinnberger.de>, 2014 # hype, 2019 @@ -19,17 +19,18 @@ # Sebastian <sebix+transifex(a)sebix.at>, 2015 # si.mueller1 <si.mueller1(a)web.de>, 2014 # si.mueller1 <si.mueller1(a)web.de>, 2014 -# Stormbr3aker <Turbodenker(a)t-online.de>, 2014 +# bed3b4546eccad21348ba9ba1d46c7c7_53b41b0 <9d75fc01e2203269fac5b74fb4e9bdc9_220778>, 2014 # 2dd41ae3ed2f3d5eeda070813d6bd017, 2015 # Tobias Bannert <tobannert(a)gmail.com>, 2013-2014 -# Stormbr3aker <Turbodenker(a)t-online.de>, 2014 +# bed3b4546eccad21348ba9ba1d46c7c7_53b41b0 <9d75fc01e2203269fac5b74fb4e9bdc9_220778>, 2014 +# Vormrodo <volkandogruer08(a)gmail.com>, 2021 # Zweimaldhaelfti <sacha.bissig(a)windowslive.com>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 05:55+0000\n" -"Last-Translator: hype\n" +"PO-Revision-Date: 2021-03-07 17:37+0000\n" +"Last-Translator: Vormrodo <volkandogruer08(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +54,7 @@ msgstr "Es ist ein Sicherheitsupdate für den Tor-Browser verfügbar." msgid "" "<a href=\"https://www.torproject.org/download/\">Click here to go to the " "download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/\">Download</a>" +msgstr "<a href=\"https://www.torproject.org/download/\">Klicke hier um auf die Download-Seite zu gelangen</a>" msgid "Sorry. You are not using Tor." msgstr "Schade. Sie benutzen nicht Tor." @@ -63,7 +64,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "Wenn Sie Tor benutzen möchten und Hilfe benötigen, schauen Sie auf die <a href=\"https://www.torproject.org/\">Tor Webseite</a> oder lesen sich die <a href=\"https://support.torproject.org/#faq\">häufig gestellten Fragen</a> durch." +msgstr "Wenn Sie versuchen, einen Tor-Client zu verwenden, schauen Sie auf die <a href=\"https://www.torproject.org/\">Tor Webseite</a> und insbesondere die <a href=\"https://support.torproject.org/#faq\">häufig gestellten Fragen</a> durch." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Ihre Anfrage ist leider fehlgeschlagen oder der Server erhielt eine unerwartete Antwort." @@ -113,4 +114,4 @@ msgid "Stay Anonymous" msgstr "Bleiben Sie anonym" msgid "Relay Search" -msgstr "Tor-Server Suche" +msgstr "Tor-Relais Suche"

1 0