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

[tor/master] Merge branch 'tor-gitlab/mr/73_squashed'
by ahf＠torproject.org 29 Jul '20

29 Jul '20

commit 109063185be9b42e343d0ef7d085494c60fa05d2 Merge: 4e71fc92c8 3cb9a9b8ce Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 29 13:34:24 2020 +0000 Merge branch 'tor-gitlab/mr/73_squashed' changes/bug33097 | 4 +++ src/core/mainloop/connection.c | 57 ++++++++++++------------------------------ src/core/mainloop/mainloop.c | 18 ++++++------- src/core/or/circuitlist.c | 1 - src/core/or/connection_st.h | 2 -- src/core/or/sendme.c | 2 +- src/lib/buf/buffers.c | 13 +++++++--- src/lib/buf/buffers.h | 2 +- src/lib/net/buffers_net.c | 33 +++++++++--------------- src/lib/net/buffers_net.h | 6 ++--- src/lib/process/process_unix.c | 2 +- src/lib/tls/buffers_tls.c | 24 ++++++------------ src/lib/tls/buffers_tls.h | 2 +- src/test/test_relaycell.c | 22 ---------------- 14 files changed, 61 insertions(+), 127 deletions(-)

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 29 Jul '20

29 Jul '20

commit 08ec072a628d70137ab7dc0ebf04f0a3d7969a41 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 29 13:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index 906bbedb71..11dabd9fd7 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -1537,13 +1537,15 @@ msgstr "هذا لمنع الاحتيال من مختبري البطاقات." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:449 msgid "If you run into an issue, please try again." -msgstr "" +msgstr "إذا واجهت مشكلة ، يرجى المحاولة مرة أخرى." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:451 msgid "" "Unfortunately, when we are receiving a high volume of donations, you might " "need to use a different browser." msgstr "" +"للأسف ، عندما نتلقى كمية كبيرة من التبرعات ، قد تحتاج إلى استخدام متصفح " +"مختلف." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:457 msgid "How can I donate via debit or credit card?"

1 0

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

29 Jul '20

commit 2587bd53663564cabb7eb3ab78cf05c57379b714 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 29 10:18:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sw/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd index 6079ad3775..b227ee04a6 100644 --- a/sw/network-settings.dtd +++ b/sw/network-settings.dtd @@ -31,7 +31,7 @@ <!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Bandari"> -<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.username "Jina la mtumiaji"> <!ENTITY torsettings.useProxy.password "Nywila nenosiri"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">

1 0

[torspec/master] Note that MAPADDRESS results can have mixed status codes.
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 1417af05de247d9f858863849d16a7185577d369 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 23:41:03 2020 -0400 Note that MAPADDRESS results can have mixed status codes. Closes #30123 --- control-spec.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 0334639..b9fa729 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -169,9 +169,10 @@ ReplyText = XXXX StatusCode = 3DIGIT - Multiple lines in a single reply from Tor to the controller are guaranteed to - share the same status code. Specific replies are mentioned below in section 3, - and described more fully in section 4. + Unless specified otherwise, multiple lines in a single reply from + Tor to the controller are guaranteed to share the same status + code. Specific replies are mentioned below in section 3, and + described more fully in section 4. [Compatibility note: versions of Tor before 0.2.0.3-alpha sometimes generate AsyncReplies of the form "*(MidReplyLine / DataReplyLine)". @@ -538,6 +539,14 @@ a certain time, then it must explicitly un-map the address when that time has elapsed. + MapAddress replies MAY contain mixed status codes. + + Example: + + C: MAPADDRESS xxx=@@@ 0.0.0.0=bogus1.google.com + S: 512-syntax error: invalid address '@@@' + S: 250 127.199.80.246=bogus1.google.com + 3.9. GETINFO Sent from the client to the server. The syntax is as for GETCONF:

1 0

[tor/master] WritingTests.md: add a section about shells
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 4e71fc92c867823495d97539a09564b0b611b7b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 22:59:47 2020 -0400 WritingTests.md: add a section about shells Closes #29485 --- doc/HACKING/WritingTests.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md index 01e80f3f66..e1497a77c2 100644 --- a/doc/HACKING/WritingTests.md +++ b/doc/HACKING/WritingTests.md @@ -504,3 +504,15 @@ targets in `Makefile.am`. (Adding new kinds of program to chutney will still require hacking the code.) + +## Other integration tests + +It's fine to write tests that use a POSIX shell to invoke Tor or test other +aspects of the system. When you do this, have a look at our existing tests +of this kind in `src/test/` to make sure that you haven't forgotten anything +important. For example: it can be tricky to make sure you're invoking Tor at +the right path in various build scenarios. + +We use a POSIX shell whenever possible here, and we use the shellcheck tool +to make sure that our scripts portable. We should only require bash for +scripts that are developer-only.

1 0

[tpo/master] Add new Tor Browser version 10.0a4
by sysrqb＠torproject.org 29 Jul '20

29 Jul '20

commit c4bee94c9ce86cb9a0ac0359d5a6f52ed908af42 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jul 29 00:11:14 2020 +0000 Add new Tor Browser version 10.0a4 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 15a3aba9..4723be16 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -24,5 +24,9 @@ body: "10.0a2", "10.0a2-MacOS", "10.0a2-Linux", -"10.0a2-Windows" +"10.0a2-Windows", +"10.0a4", +"10.0a4-MacOS", +"10.0a4-Linux", +"10.0a4-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 5c776a41..64381e8e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,10 +6,10 @@ win32 = 0.4.3.6 version = 9.5.3 [torbrowser-alpha] -version = 10.0a2 +version = 10.0a4 [torbrowser-android-alpha] -version = 10.0a3 +version = 10.0a4 [tor-stable] version = 0.4.3.6

1 0

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

28 Jul '20

commit ca1e33a6c5fd4e0a65a9bb2f075216f0157978e0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 20:16:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he.po b/he.po index 2c336df705..b227ba1a88 100644 --- a/he.po +++ b/he.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-28 20:10+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\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 28 Jul '20

28 Jul '20

commit 5da786bfc0d4ca19c7c4eb6232b471f472926695 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 20:15:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- he.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/he.po b/he.po index 2d80b4dcb8..fc0d9fba60 100644 --- a/he.po +++ b/he.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-28 20:10+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -662,13 +662,13 @@ msgstr "שמור קבצים מאוחסנים בסיפריית `Persistent'" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Welcome Screen" -msgstr "" +msgstr "מסך ברוך הבא" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "" "Beta: only the additional setting to enable the Unsafe Browser is made " "persistent" -msgstr "" +msgstr "בטא: רק ההגדרה הנוספת לאפשור הדפדפן הבלתי בטוח נעשית מתמידה." #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks" @@ -1405,14 +1405,14 @@ msgstr "בחר מֵכַל קבצים" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Launch the Unsafe Browser?" -msgstr "" +msgstr "להריץ את הדפדפן הבלתי בטוח?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "The Unsafe Browser is not anonymous and the websites that you visit can see " "your real IP address.\\n\\nOnly use the Unsafe Browser to log in to a " "captive portal or browse trusted web pages on the local network." -msgstr "" +msgstr "הדפדפן הבלתי בטוח אינו אלמוני והאתרים שאתה מבקר בהם יכולים לראות את כתובת ה־IP האמיתית שלך.\\n\\nהשתמש בדפדפן הבלתי בטוח רק כדי להיכנס אל פורטל שבוי או כדי לגלוש בדפי רשת מהימנים על הרשת המקומית." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." @@ -1446,7 +1446,7 @@ msgstr "דפדפן בלתי־בטוח" msgid "" "The Unsafe Browser was not enabled in the Welcome Screen.\\n\\nTo use the Unsafe Browser, restart Tails and enable the Unsafe Browser in the additional settings of the Welcome Screen.\\n\n" "To always enable the Unsafe Browser, turn on the Welcome Screen feature of the Persistent Storage." -msgstr "" +msgstr "הדפדפן הבלתי בטוח לא אופשר במסך הברוך הבא.\\n\\nכדי להשתמש בדפדפן הבלתי הבטוח, הפעל מחדש את Tails ואפשר את הדפדפן הבלתי בטוח בהגדרה הנוספת של מסך הברוך הבא.\\n\nכדי לאפשר לתמיד את הדפדפן הבלתי בטוח, הפעל את מאפיין מסך הברוך הבא של האחסון המתמיד." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99 msgid ""

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 28 Jul '20

28 Jul '20

commit e913e3bb7bbec68cf677db00d235731ddc04806c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 20:15:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index fdc9fcd8cc..906bbedb71 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -1512,6 +1512,8 @@ msgid "" "If you run into problems, please contact <span " "class=\"email\">giving(at)torproject.org</span>." msgstr "" +"إذا واجهت مشاكل ، يرجى الاتصال<span class=\"email\"> بgiving (في) " +"torproject.org</span>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:443 msgid "" @@ -1526,10 +1528,12 @@ msgid "" "Some users experience issues because PayPal limits the number of times an IP" " address can be used in a certain period of time." msgstr "" +"يواجه بعض المستخدمين مشكلات لأن PayPal يحد من عدد المرات التي يمكن فيها " +"استخدام عنوان IP في فترة زمنية معينة." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:447 msgid "This is to prevent fraud from card testers." -msgstr "" +msgstr "هذا لمنع الاحتيال من مختبري البطاقات." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:449 msgid "If you run into an issue, please try again."

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 28 Jul '20

28 Jul '20

commit be9dc299afe5d7224ddb0dddd816372a35d6c8bb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 19:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index fe3e40df50..fdc9fcd8cc 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -1403,10 +1403,14 @@ msgid "" " links\">torservers.net</a> is a German charitable non-profit that runs a " "wide variety of exit relays worldwide." msgstr "" +"<a href=\"https://www.torservers.net/\" target=\"_blank\" class=\"hyperlinks" +" links\">torservers.net</a> هي منظمة خيرية ألمانية غير ربحية تدير مجموعة " +"متنوعة من مرحلات الخروج في جميع أنحاء العالم." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:391 msgid "They also like donations of bandwidth from ISPs." msgstr "" +"كما أنهم يحبون التبرعات من عرض النطاق الترددي من مقدمي خدمات الإنترنت." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:395 msgid "" @@ -1415,6 +1419,10 @@ msgid "" "501(c)(3) non-profit that collects donations and turns them into more US-" "based exit relay capacity." msgstr "" +"<a href=\"https://www.noisebridge.net/wiki/Noisebridge_Tor\" " +"target=\"_blank\" class=\"hyperlinks links\">Noisebridge</a> هي مؤسسة غير " +"ربحية 501 (c) (3) ومقرها الولايات المتحدة تجمع التبرعات وتحولها إلى المزيد " +"من سعة ترحيل الخروج في الولايات المتحدة." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:399 msgid "" @@ -1422,6 +1430,9 @@ msgid "" "links\">Nos Oignons</a> is a French charitable non-profit that runs fast " "exit relays in France." msgstr "" +"<a href=\"https://nos-oignons.net/\" target=\"_blank\" class=\"hyperlinks " +"links\">Nos Oignons</a> هي مؤسسة خيرية فرنسية غير ربحية تدير مرحلات خروج " +"سريعة في فرنسا." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:403 msgid "" @@ -1429,6 +1440,8 @@ msgid "" "class=\"hyperlinks links\">DFRI</a> is a Swedish non-profit running exit " "relays." msgstr "" +"<a href=\"https://www.dfri.se/donera/?lang=en\" target=\"_blank\" " +"class=\"hyperlinks links\">DFRI</a> هي مرحلات خروج سويدية غير ربحية." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:407 msgid "" @@ -1436,16 +1449,19 @@ msgid "" "target=\"_blank\" class=\"hyperlinks links\">The Tor Project, Inc</a>, but " "we consider that a good thing." msgstr "" +"هذه المنظمات ليست مثل<a href=\"/%langcode%\" target=\"_blank\" " +"class=\"hyperlinks links\"> The Tor Project، Inc</a> ، لكننا نعتبر ذلك شيئًا" +" جيدًا." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:409 msgid "They're run by nice people who are part of the Tor community." -msgstr "" +msgstr "يديرهم أناس لطفاء هم جزء من مجتمع Tor." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:415 msgid "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" -msgstr "" +msgstr "هل يمكنني التبرع لمشروع معين ، أو تقييد تبرعي لغرض معين؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:419 #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:749 @@ -1458,24 +1474,30 @@ msgid "" "used, we're required by the IRS to track and report separately on that " "money." msgstr "" +"إذا قبلنا تبرعًا من شخص ما قد حدد كيفية استخدامه ، فنحن مطالبون من قبل مصلحة" +" الضرائب بتتبع هذه الأموال والإبلاغ عنها بشكل منفصل." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:423 msgid "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." msgstr "" +"سيكون هذا عبئا إداريا كبيرا لمنظمة صغيرة ، ولا نعتقد أنها فكرة جيدة بالنسبة " +"لنا." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:425 msgid "" "However, we would be very happy to hear your ideas and feedback about our " "work." -msgstr "" +msgstr "ومع ذلك ، يسعدنا جدًا سماع أفكارك وملاحظاتك حول عملنا." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:427 msgid "" "If you're donating using a mechanism that allows for comments, feel free to " "send your thoughts that way." msgstr "" +"إذا كنت تتبرع باستخدام آلية تسمح بالتعليقات ، فلا تتردد في إرسال أفكارك بهذه" +" الطريقة." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:433 msgid "Can I donate while using Tor Browser?"

1 0