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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Dec '20

15 Dec '20

commit e6dd2d219bbcd55f536d1ca3ddcf0a0359e10323 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 15 17:48:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index 93add1b09c..60c663e3be 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3641,6 +3641,9 @@ msgid "" " you will have downloaded a different version than 9.0 and you may not have " "chosen the English (en-US) version." msgstr "" +"Внимание: эти команды используют в качестве имен файлов примеры. Ваши файлы " +"будут иметь другие имена (ваша версия Tor Browser будет новее, и, вероятно, " +"вы выберете русский язык)." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3657,6 +3660,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc " "~/Downloads/TorBrowser-9.0-osx64_en-US.dmg" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc " +"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3672,6 +3677,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-" "US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-" +"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Dec '20

15 Dec '20

commit 8680580fa8665537bdf8dc949ab77beb5eb30024 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 15 17:18:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index e446e7ebb9..93add1b09c 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3281,6 +3281,11 @@ msgid "" "it](https://support.torproject.org/tbb/how-to-verify-signature/), these are " "false positives and you have nothing to worry about." msgstr "" +"Если вы скачали Tor Browser с нашего [главного " +"сайта](https://www.torproject.org/ru/download/) или использовали " +"[GetTor](https://gettor.torproject.org/) с [верификацией " +"подписи](https://support.torproject.org/ru/tbb/how-to-verify-signature/), " +"эти срабатывания – ложные. Вам не о чем беспокоиться." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3288,6 +3293,8 @@ msgid "" "Some antiviruses consider that files that have not been seen by a lot of " "users as suspicious." msgstr "" +"Некоторые антивирусы считают, что если файл не доступен сразу многим " +"пользователям, это подозрительный файл." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3296,6 +3303,9 @@ msgid "" "and has not been modified by some attacker, you can [verify Tor Browser's " "signature](https://support.torproject.org/tbb/how-to-verify-signature/)." msgstr "" +"Есть сомнения, что скачанная программа Tor настоящая, а не какая-то подмена " +"от злоумышленника? Можете [проверить подпись Tor " +"Browser](https://support.torproject.org/ru/tbb/how-to-verify-signature/)." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3304,6 +3314,9 @@ msgid "" "processes](https://support.torproject.org/tbb/tbb-10) to prevent antiviruses" " from blocking access to Tor Browser." msgstr "" +"Возможно, вы захотите внести некоторые процессы в [белый " +"список](https://support.torproject.org/ru/tbb/tbb-10). Тогда антивирус " +"перестанет блокировать доступ к Tor Browser." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) @@ -3364,6 +3377,8 @@ msgid "" "These are example file names and will not exactly match the file names that " "you download." msgstr "" +"Эти имена файлов выбраны для примера. Они не будут в точности совпадать с " +"именами файлов, которые скачиваете вы." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3562,6 +3577,9 @@ msgid "" " import the key using the **Workaround (using a public key)** section " "instead." msgstr "" +"Если вы видите сообщение об ошибке, то не сможете продолжить, пока не " +"выясните причину. Возможно, импортировать ключ получится способом, описанным" +" в разделе **Альтернативный вариант (с использованием открытого ключа)**." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3588,6 +3606,8 @@ msgid "" "gone wrong and you cannot continue until you've figured out why this didn't " "work." msgstr "" +"Если после выполнения этой команды не появится `./tor.keyring`, значит, что-" +"то пошло не так. Вы не сможете продолжить, пока не выясните причину." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 15 Dec '20

15 Dec '20

commit 26838305d5c88a5f43fe80982c5ac385aff12b71 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 15 17:18:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-hi.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tor-outreach2019-2020-hi.md b/tor-outreach2019-2020-hi.md index b821f2d8c1..541383e4ec 100644 --- a/tor-outreach2019-2020-hi.md +++ b/tor-outreach2019-2020-hi.md @@ -10,23 +10,23 @@ यह इतना आक्रामक लगता है कि वह ऑनलाइन विज्ञापनों पर कुछ शोध करती है और यह जानती है कि यह न सिर्फ विज्ञापनदाताओं पर नज़र रखता है, बल्कि उसकी आईएसपी, एनालिटिक्स कंपनियों, सोशल मीडिया प्लेटफॉर्म और भी बहुत कुछ है। -Aleisha decides she wants to find and use software that doesn't collect her data, doesn't track her, and doesn't tell other services anything private about her. +अलेशा तय करती है कि वह ऐसे सॉफ़्टवेयर को ढूंढना और उसका उपयोग करना चाहती है जो उसका डेटा एकत्र नहीं करता है, उसे ट्रैक नहीं करता है, और अन्य सेवाओं को उसके बारे में कुछ भी निजी नहीं बताता है। -She goes to a privacy training at a local hackerspace and learns about **Tor Browser**, the only web browser that allows her to browse anonymously. +वह एक स्थानीय हैकरस्पेस में एक गोपनीयता प्रशिक्षण में जाती है और ** टोर ब्राउज़र ** के बारे में जानती है, एकमात्र वेब ब्राउज़र जो उसे गुमनाम रूप से ब्राउज़ करने की अनुमति देता है। ---- +---- -# 2.TOR FOR FEMINISTS +# 2. महिलाओं के लिए टोर -### The future is cyberfeminist +### भविष्य साइबरनारीवादी है -Fernanda runs a women's collective focused on reproductive rights in Brazil, where abortion is illegal. +फर्नांडा ब्राजील में प्रजनन अधिकारों पर केंद्रित एक महिला सामूहिक चलाता है, जहां गर्भपात अवैध है। -Fernanda and her colleagues built a website with information about abortion access, birth control, and other resources for people seeking reproductive information. +फर्नांडा और उनके सहयोगियों ने प्रजनन जानकारी प्राप्त करने वाले लोगों के लिए गर्भपात पहुंच, जन्म नियंत्रण और अन्य संसाधनों के बारे में जानकारी के साथ एक वेबसाइट बनाई। -If this website was linked back to them, they could be arrested--or worse. +यदि यह वेबसाइट उनके साथ वापस लिंक की गई थी, तो उन्हें गिरफ्तार किया जा सकता है - या इससे भी बदतर। -To protect themselves, Fernanda and her colleagues created the website using Tor **onion services**. Onion services not only protect them from being discovered as the operators of the server but also help protect visitors to their website by requiring they use Tor Browser. +खुद को बचाने के लिए, फर्नांड और उनके सहयोगियों ने टोर ** प्याज सेवाओं ** का उपयोग करके वेबसाइट बनाई। प्याज सेवाएँ न केवल उन्हें सर्वर के संचालकों के रूप में खोजे जाने से बचाती हैं, बल्कि उनकी वेबसाइट पर आगंतुकों को टोर ब्राउज़र का उपयोग करने के लिए उनकी सुरक्षा करने में भी मदद करती हैं। In fact, Fernanda uses **Tor Browser** for all of her web browsing just to be on the safe side. @@ -34,7 +34,7 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act ### Reproductive rights activists like Fernanda are fighting for fundamental freedoms, and Tor helps power their resistance. ---- +---- # 3. TOR FOR HUMAN RIGHTS @@ -56,7 +56,7 @@ All of this software uses Tor to help protect Jelani’s privacy. ### Human rights activists like Jelani are fighting for justice in their communities, and Tor helps power their resistance. ---- +---- # 4. TOR FOR ANTI-CENSORSHIP @@ -88,7 +88,7 @@ With Tor Browser, Jean can browse freely and privately and contact his family. ### Censored users all over the world rely on Tor Browser for a free, stable, and uncensored way to access the internet. ---- +---- # 5. Shared Sections

1 0

[tor/maint-0.4.5] Socks5: handle truncated client requests correctly
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit c4fe66e342292b45f29e9fd242b66a0ca27a7758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 10:14:03 2020 -0500 Socks5: handle truncated client requests correctly Previously, our code would send back an error if the socks5 request parser said anything but DONE. But there are other non-error cases, like TRUNCATED: we shouldn't send back errors for them. This patch lowers the responsibility for setting the error message into the parsing code, since the actual type of the error message will depend on what problem was encountered. Fixes bug 40190; bugfix on 0.3.5.1-alpha. --- changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug40190 b/changes/bug40190 new file mode 100644 index 0000000000..0f3d6941dc --- /dev/null +++ b/changes/bug40190 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS5): + - Handle partial socks5 messages correctly. Previously, our code would + send an incorrect error message if it got a socks5 request that wasn't + complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha. diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index c7bf13b9f4..5a7d7ac9be 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -545,6 +545,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (parsed == -1) { log_warn(LD_APP, "socks5: parsing failed - invalid client request"); res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } else if (parsed == -2) { res = SOCKS_RESULT_TRUNCATED; @@ -556,6 +557,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (socks5_client_request_get_version(trunnel_req) != 5) { res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } @@ -590,6 +592,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, tor_addr_to_str(req->address, &destaddr, sizeof(req->address), 1); } break; default: { + socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED); res = -1; } break; } @@ -770,8 +773,10 @@ handle_socks_message(const uint8_t *raw_data, size_t datalen, } else { res = parse_socks5_client_request(raw_data, req, datalen, drain_out); - if (res != SOCKS_RESULT_DONE) { + if (BUG(res == SOCKS_RESULT_INVALID && req->replylen == 0)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); + } + if (res != SOCKS_RESULT_DONE) { goto end; }

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit 1430d5ff632f0900545047479a94dbe3417c2e76 Merge: 93f2de8523 4a77aa6e82 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 15 11:58:22 2020 -0500 Merge branch 'maint-0.4.5' changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/239' into maint-0.4.5
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit 4a77aa6e8248f06e17a9a7375076b9d685a6b789 Merge: c731a4efec c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 15 11:58:13 2020 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.4.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/master] Socks5: handle truncated client requests correctly
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit c4fe66e342292b45f29e9fd242b66a0ca27a7758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 10:14:03 2020 -0500 Socks5: handle truncated client requests correctly Previously, our code would send back an error if the socks5 request parser said anything but DONE. But there are other non-error cases, like TRUNCATED: we shouldn't send back errors for them. This patch lowers the responsibility for setting the error message into the parsing code, since the actual type of the error message will depend on what problem was encountered. Fixes bug 40190; bugfix on 0.3.5.1-alpha. --- changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug40190 b/changes/bug40190 new file mode 100644 index 0000000000..0f3d6941dc --- /dev/null +++ b/changes/bug40190 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS5): + - Handle partial socks5 messages correctly. Previously, our code would + send an incorrect error message if it got a socks5 request that wasn't + complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha. diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index c7bf13b9f4..5a7d7ac9be 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -545,6 +545,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (parsed == -1) { log_warn(LD_APP, "socks5: parsing failed - invalid client request"); res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } else if (parsed == -2) { res = SOCKS_RESULT_TRUNCATED; @@ -556,6 +557,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (socks5_client_request_get_version(trunnel_req) != 5) { res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } @@ -590,6 +592,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, tor_addr_to_str(req->address, &destaddr, sizeof(req->address), 1); } break; default: { + socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED); res = -1; } break; } @@ -770,8 +773,10 @@ handle_socks_message(const uint8_t *raw_data, size_t datalen, } else { res = parse_socks5_client_request(raw_data, req, datalen, drain_out); - if (res != SOCKS_RESULT_DONE) { + if (BUG(res == SOCKS_RESULT_INVALID && req->replylen == 0)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); + } + if (res != SOCKS_RESULT_DONE) { goto end; }

1 0

[tor/master] Merge branch 'tor-gitlab/mr/239' into maint-0.4.5
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit 4a77aa6e8248f06e17a9a7375076b9d685a6b789 Merge: c731a4efec c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 15 11:58:13 2020 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.4.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Socks5: handle truncated client requests correctly
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit c4fe66e342292b45f29e9fd242b66a0ca27a7758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 10:14:03 2020 -0500 Socks5: handle truncated client requests correctly Previously, our code would send back an error if the socks5 request parser said anything but DONE. But there are other non-error cases, like TRUNCATED: we shouldn't send back errors for them. This patch lowers the responsibility for setting the error message into the parsing code, since the actual type of the error message will depend on what problem was encountered. Fixes bug 40190; bugfix on 0.3.5.1-alpha. --- changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug40190 b/changes/bug40190 new file mode 100644 index 0000000000..0f3d6941dc --- /dev/null +++ b/changes/bug40190 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS5): + - Handle partial socks5 messages correctly. Previously, our code would + send an incorrect error message if it got a socks5 request that wasn't + complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha. diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index c7bf13b9f4..5a7d7ac9be 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -545,6 +545,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (parsed == -1) { log_warn(LD_APP, "socks5: parsing failed - invalid client request"); res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } else if (parsed == -2) { res = SOCKS_RESULT_TRUNCATED; @@ -556,6 +557,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (socks5_client_request_get_version(trunnel_req) != 5) { res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } @@ -590,6 +592,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, tor_addr_to_str(req->address, &destaddr, sizeof(req->address), 1); } break; default: { + socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED); res = -1; } break; } @@ -770,8 +773,10 @@ handle_socks_message(const uint8_t *raw_data, size_t datalen, } else { res = parse_socks5_client_request(raw_data, req, datalen, drain_out); - if (res != SOCKS_RESULT_DONE) { + if (BUG(res == SOCKS_RESULT_INVALID && req->replylen == 0)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); + } + if (res != SOCKS_RESULT_DONE) { goto end; }

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/239' into maint-0.4.5
by dgoulet＠torproject.org 15 Dec '20

15 Dec '20

commit 4a77aa6e8248f06e17a9a7375076b9d685a6b789 Merge: c731a4efec c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 15 11:58:13 2020 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.4.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0