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

[dip/master] Edit gitaly config to debug errors
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit c33616e19aa2ac198b3471613cb8a7415beebbd8 Author: hiro <hiro(a)torproject.org> Date: Tue Jan 14 11:53:52 2020 +0100 Edit gitaly config to debug errors --- roles/gitaly/templates/gitaly.toml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2 index 99f4353..5f29374 100644 --- a/roles/gitaly/templates/gitaly.toml.j2 +++ b/roles/gitaly/templates/gitaly.toml.j2 @@ -13,8 +13,8 @@ bin_dir = "{{ ansible_user_dir }}/bin" prometheus_listen_addr = "localhost:9236" # # Git executable settings -# [git] -# bin_path = "/usr/bin/git" +[git] +bin_path = "/usr/bin/git" [[storage]] name = "default"

1 0

[dip/master] Remove trailing slash from repositories path to debug gitaly errors
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit d8dfec717ce8b6ddd2c5927e6bd0e14ddfce9b96 Author: hiro <hiro(a)torproject.org> Date: Tue Jan 14 09:43:03 2020 +0100 Remove trailing slash from repositories path to debug gitaly errors --- roles/gitlab/templates/gitlab.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitlab/templates/gitlab.yml.j2 b/roles/gitlab/templates/gitlab.yml.j2 index 79f0dd0..45fba44 100644 --- a/roles/gitlab/templates/gitlab.yml.j2 +++ b/roles/gitlab/templates/gitlab.yml.j2 @@ -516,7 +516,7 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: - path: {{ ansible_user_dir }}/repositories/ + path: {{ ansible_user_dir }}/repositories gitaly_address: unix:{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 14 Jan '20

14 Jan '20

commit b7e68334021561321b28b1de6aade60fdc790f9e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 14 10:45:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fa.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 3802883f28..77b81df919 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -3510,7 +3510,7 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "### French" -msgstr "" +msgstr "### فرانسوی" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -3520,7 +3520,7 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "### German" -msgstr "" +msgstr "### آلمانی" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -3580,7 +3580,7 @@ msgstr "" #: https//community.torproject.org/outreach/talk/ #: (content/outreach/talk/contents+en.lrpage.title) msgid "Talk about Tor" -msgstr "" +msgstr "درباره تور حرف بزنید" #: https//community.torproject.org/outreach/talk/ #: (content/outreach/talk/contents+en.lrpage.subtitle) @@ -4662,7 +4662,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.body) msgid "server:" -msgstr "" +msgstr "سرور:" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.body) @@ -4755,7 +4755,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "# Before You Start" -msgstr "" +msgstr "# قبل از اینکه شروع کنید" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -4858,7 +4858,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "https://www.torproject.org/overview.html" -msgstr "" +msgstr "https://www.torproject.org/overview.html" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -5020,7 +5020,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "<web server here>." -msgstr "" +msgstr "<web server here>." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -5167,12 +5167,12 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "http://cd34.com/blog/webserver/ddos-attack-mitigation/" -msgstr "" +msgstr "http://cd34.com/blog/webserver/ddos-attack-mitigation/" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "http://deflate.medialayer.com/" -msgstr "" +msgstr "http://deflate.medialayer.com/" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6275,7 +6275,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ #: (content/relay-operations/community-resources/tor-exit-guidelines/contents+en.lrpage.body) msgid "## Technical" -msgstr "" +msgstr "## فنی" #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ #: (content/relay-operations/community-resources/tor-exit-guidelines/contents+en.lrpage.body) @@ -8018,7 +8018,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) msgid "Congrats!" -msgstr "" +msgstr "تبریک!" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) @@ -8375,7 +8375,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "cd /usr" -msgstr "" +msgstr "cd /usr" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9183,7 +9183,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.title) msgid "OpenBSD" -msgstr "" +msgstr "OpenBSD" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.subtitle) @@ -9413,7 +9413,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg install tor" -msgstr "" +msgstr "pkg install tor" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) @@ -9467,7 +9467,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.title) msgid "CentOS/RHEL" -msgstr "" +msgstr "CentOS/RHEL" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.subtitle) @@ -9523,7 +9523,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) msgid "`yum install tor`" -msgstr "" +msgstr "`yum install tor`" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 14 Jan '20

14 Jan '20

commit 1132dad5f0f62750177c9f4c94e46ca2841221d4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 14 10:23:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fa.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 0626da0d8d..da2568cb22 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -7,11 +7,11 @@ # Emma Peel, 2019 # Saba Rostami <saba(a)asl19.org>, 2019 # Ali A, 2019 -# magnifico, 2019 # b0b47d46632b78a09a40de799fda9a65, 2019 # MYZJ, 2019 # Samaneh M <asamana.haoma(a)gmail.com>, 2019 # Hamid reza Zaefarani, 2019 +# magnifico, 2020 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Hamid reza Zaefarani, 2019\n" +"Last-Translator: magnifico, 2020\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -651,7 +651,7 @@ msgstr "" #: https//www.torproject.org/press/-new-release-tor/ #: (content/press/new-release-tor/contents+en.lrpost.title) msgid "New Release: Tor 0.4.0.1-alpha" -msgstr "" +msgstr "انتشار جدید: تور 0.4.0.1-alpha" #: https//www.torproject.org/press/-new-release-tor/ #: (content/press/new-release-tor/contents+en.lrpost.summary) @@ -966,7 +966,7 @@ msgstr "" #: templates/contact.html:100 msgid "Email us" -msgstr "" +msgstr "به ما ایمیل بزنید" #: templates/contact.html:101 msgid "" @@ -982,7 +982,7 @@ msgstr "" #: templates/download-android.html:12 msgid "Get Tor Browser for Android." -msgstr "" +msgstr "دریافت مرورگر تور برای اندروید" #: templates/download-android.html:15 templates/hero-download.html:5 msgid "Protect yourself against tracking, surveillance, and censorship." @@ -1290,7 +1290,7 @@ msgstr "" #: templates/people.html:28 msgid "Join Our Team" -msgstr "" +msgstr "عضو تیم ما شوید" #: templates/people.html:29 msgid "" @@ -1305,7 +1305,7 @@ msgstr "" #: templates/press.html:7 msgid "Get support" -msgstr "" +msgstr "دریافت پشتیبانی" #: templates/press.html:9 msgid "Visit our Support Portal" @@ -1325,7 +1325,7 @@ msgstr "" #: templates/press.html:27 msgid "The Tor Browser" -msgstr "" +msgstr "مرورگر تور" #: templates/press.html:30 msgid "Onion Services" @@ -1390,7 +1390,7 @@ msgstr "" #: templates/sponsors.html:5 msgid "Active Sponsors" -msgstr "" +msgstr "حامیان فعال" #: templates/sponsors.html:17 msgid "Past Sponsors"

1 0

[tor/master] hs-v2: Always check rend_cache validity before using it
by asn＠torproject.org 14 Jan '20

14 Jan '20

commit bbe90e3ec1b308e32f83e9f30f3706645e2b8e36 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jan 13 09:25:26 2020 -0500 hs-v2: Always check rend_cache validity before using it When looking up an entry in the rend_cache, stop asserting that it exists but rather confirm it exists and if not, return that no entry was found. The reason for that is because the hs_circ_cleanup_on_free() function (which can end up looking at the rend_cache) can be called from the circuit_free_all() function that is called _after_ the rend cache is cleaned up in tor_free_all(). We could fix the free all ordering but then it will just hide a future bug. Instead, handle a missing rend_cache as a valid use case as in while we are in the cleanup process. As Tor becomes more modular, it is getting more and more difficult to ensure subsystem callstack ordering thus this fix aims at making the HSv2 subsystem more robust at being called while tor is pretty much in any kind of state. Fixes #32847. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/rend/rendcache.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c index 04748edbd..0890a81d8 100644 --- a/src/feature/rend/rendcache.c +++ b/src/feature/rend/rendcache.c @@ -526,9 +526,16 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) rend_cache_entry_t *entry = NULL; static const int default_version = 2; - tor_assert(rend_cache); tor_assert(query); + /* This is possible if we are in the shutdown process and the cache was + * freed while some other subsystem might do a lookup to the cache for + * cleanup reasons such HS circuit cleanup for instance. */ + if (!rend_cache) { + ret = -ENOENT; + goto end; + } + if (!rend_valid_v2_service_id(query)) { ret = -EINVAL; goto end;

1 0

[tor/master] Merge branch 'tor-github/pr/1656'
by asn＠torproject.org 14 Jan '20

14 Jan '20

commit 1ba193b7a8bb5d56aa58aad3a960cd454ad0d144 Merge: 8095c785f bbe90e3ec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 14 12:21:29 2020 +0200 Merge branch 'tor-github/pr/1656' src/feature/rend/rendcache.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

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

14 Jan '20

commit e2c940e00e9fd5809c02284102c40103ed572a65 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 14 10:15:43 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fa/LC_MESSAGES/messages.po | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/locale/fa/LC_MESSAGES/messages.po b/locale/fa/LC_MESSAGES/messages.po index d8d479394e..aa2db26209 100644 --- a/locale/fa/LC_MESSAGES/messages.po +++ b/locale/fa/LC_MESSAGES/messages.po @@ -229,7 +229,7 @@ msgstr "آیا می‌خواهید با کارت یا پی‌پال اهدا ک #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:70 msgid "" "Thanks for your interest in donating cryptocurrency to the Tor Project." -msgstr "" +msgstr "از علاقه شما در اهدا ارز دیجیتال به پروژه‌ی تور سپاسگزاریم." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:77 #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:133 @@ -370,7 +370,7 @@ msgstr "@torproject" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:92 msgid "Donate using BTCPayServer" -msgstr "" +msgstr "اهدا از طریق BTCPayServer" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126 msgid "Donate using wallet addresses" @@ -1224,7 +1224,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:159 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:76 msgid "It was founded in 2006." -msgstr "" +msgstr "در 2006 ایجاد شده است." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:165 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:82 @@ -1603,7 +1603,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:349 msgid "The account information is as follows:" -msgstr "" +msgstr "اطلاعات حساب کاربری به شکل زیر است:" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:353 msgid "" @@ -1750,7 +1750,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:433 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:294 msgid "Can I donate while using Tor Browser?" -msgstr "" +msgstr "می توانم در هنگام استفاده از مرورگر تور اهدا کنم؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:437 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:298 @@ -1833,7 +1833,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:481 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:338 msgid "Why is there a minimum donation?" -msgstr "" +msgstr "چرا برای اهدا حداقل وجود دارد؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:485 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:342 @@ -1884,13 +1884,15 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:513 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:378 msgid "You can buy cash gift cards and mail them to us." -msgstr "" +msgstr "شما میتوانید گیفت کارت پولی بخرید و آن ها را برای ما پست کنید." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:515 msgid "" "There are probably other ways to donate anonymously that we haven't thought " "of -- maybe you will." msgstr "" +"احتمالا راه های دیگری هم برای اهدا به صورت ناشناس وجود دارد که ما از آن بی " +"خبریم -- شاید شما بدانید." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:521 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:474 @@ -1914,11 +1916,11 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:533 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:486 msgid "Do you accept cash donations?" -msgstr "" +msgstr "آیا اهدا نقد قبول می کنید؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:543 msgid "Can I donate via AmazonSmile?" -msgstr "" +msgstr "آیا میتوانم از طریق AmazonSmile اهدا کنم؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:547 msgid "" @@ -1985,11 +1987,11 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:595 msgid "E-mail: <span class=\"email\">jeffrey.k.miller(at)ml.com</span>" -msgstr "" +msgstr "ایمیل: <span class=\"email\">jeffrey.k.miller(at)ml.com</span>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:599 msgid "FAX: 206.388.4456" -msgstr "" +msgstr "فکس: 206.388.4456" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:603 msgid "The Tor Project Account #: ***-*3016" @@ -2768,7 +2770,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:228 msgid "The Tor Project spends about $4 million annually." -msgstr "" +msgstr "پروژه‌ی تور سالیانه حدود 4 میلیون دلار خرج می کند." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:306 msgid ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 14 Jan '20

14 Jan '20

commit e89784c71869c9b6033b28ca3b6f81e41a90832d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 14 10:15:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fa.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 86154490f3..3802883f28 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -73,7 +73,7 @@ msgstr "" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.cta) msgid "Grow the Tor network" -msgstr "" +msgstr "شبکه‌ی تور را گسترش دهید" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) @@ -128,7 +128,7 @@ msgstr "" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.title) msgid "Training" -msgstr "" +msgstr "آموزش" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.subtitle) @@ -215,7 +215,7 @@ msgstr "" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.cta) msgid "Help us translate" -msgstr "" +msgstr "کمک به ما در ترجمه" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body) @@ -258,7 +258,7 @@ msgstr "" #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.cta) msgid "Tell the world about Tor" -msgstr "" +msgstr "به همه درباره تور بگویید" #: https//community.torproject.org/outreach/ #: (content/outreach/contents+en.lrpage.body) @@ -670,7 +670,7 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Tor Version" -msgstr "" +msgstr "# نسخه تور" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -3153,12 +3153,12 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "https://blog.torproject.org/announcing-vanguards-add-onion-services" -msgstr "" +msgstr "https://blog.torproject.org/announcing-vanguards-add-onion-services" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.title) msgid "Current Status of Translations" -msgstr "" +msgstr "وضعیت فعلی ترجمه ها" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.subtitle) @@ -3228,7 +3228,7 @@ msgstr "" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) msgid "Thank you for your interest in helping us with translations." -msgstr "" +msgstr "از علاقه شما به کمک به ما در ترجمه ها سپاسگزاریم." #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) @@ -3480,7 +3480,7 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "### Spanish" -msgstr "" +msgstr "### اسپانیایی" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body)

1 0

[tor/release-0.4.2] test_practracker.sh: never disable practracker
by teor＠torproject.org 14 Jan '20

14 Jan '20

commit 6b1592b56439ddbb9e47444f77de2d03429cc0ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 13 16:17:51 2020 -0500 test_practracker.sh: never disable practracker When practracker is disabled, its output will be empty. We don't want that happening during our tests. Fixes bug 32705; bugfix on 0.4.2.1-alpha, when test_practracker.sh was introduced. --- changes/ticket32705_disable | 4 ++++ scripts/maint/practracker/test_practracker.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable new file mode 100644 index 000000000..1da643175 --- /dev/null +++ b/changes/ticket32705_disable @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the + test_practracker.sh script. Doing so caused a test failure. + Fixes bug 32705; bugfix on 0.4.2.1-alpha. diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh index 9b107e071..207a5cede 100755 --- a/scripts/maint/practracker/test_practracker.sh +++ b/scripts/maint/practracker/test_practracker.sh @@ -1,6 +1,7 @@ #!/bin/sh umask 077 +unset TOR_DISABLE_PRACTRACKER TMPDIR="" clean () {

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 14 Jan '20

14 Jan '20

commit afa4cc57bf101eb3effbd233fc3d18265279fe8e Merge: f1173a63f 7e111d0ea Author: teor <teor(a)torproject.org> Date: Tue Jan 14 17:41:40 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket32705_disable | 7 +++++++ scripts/maint/practracker/practracker.py | 2 ++ scripts/maint/practracker/test_practracker.sh | 1 + 3 files changed, 10 insertions(+)

1 0