October 2018 - tor-commits - lists.torproject.org

[sbws/master] Merge branch 'ticket28159_rtts'
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 5a88f749e15764f08bf5b40b46db2a655d12d2b5 Merge: ed1d61c 4546416 Author: juga0 <juga(a)riseup.net> Date: Sun Oct 28 07:19:38 2018 +0000 Merge branch 'ticket28159_rtts' CHANGELOG.md | 1 + sbws/config.default.ini | 2 +- sbws/lib/resultdump.py | 2 +- sbws/lib/v3bwfile.py | 6 ++++-- sbws/util/config.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-)

1 0

[sbws/master] Add entry about disable measuring RTTs
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 454641665d2a6ad30c85d1fd879781c50375a7d3 Author: juga0 <juga(a)riseup.net> Date: Tue Oct 23 17:19:00 2018 +0000 Add entry about disable measuring RTTs --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 148fce4..60038bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. incorrect (#28041) - Stop removing results that are not away from some other X secs (#28103) - Use secs-away when provided instead of data_period (#28105) +- Disable measuring RTTs (#28159) ## Added

1 0

[sbws/master] Allow 0 RTT measurements
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit e0532a96069c96f25d638fb9884da279225641a9 Author: juga0 <juga(a)riseup.net> Date: Tue Oct 23 12:30:32 2018 +0000 Allow 0 RTT measurements To speed up the scanner. RTT is not being used at the moment, set the default to 0. --- sbws/config.default.ini | 2 +- sbws/lib/resultdump.py | 2 +- sbws/lib/v3bwfile.py | 6 ++++-- sbws/util/config.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index e7950b1..93b3505 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -42,7 +42,7 @@ download_min = 5 download_target = 6 download_max = 10 # How many RTT measurements to make -num_rtts = 10 +num_rtts = 0 # Number of downloads with acceptable times we must have for a relay before # moving on num_downloads = 5 diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index abf45fb..22e3f3a 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -476,7 +476,7 @@ class ResultSuccess(Result): def from_dict(d): assert isinstance(d, dict) return ResultSuccess( - d['rtts'], d['downloads'], + d['rtts'] or [], d['downloads'], Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], d['relay_average_bandwidth'], diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index c35c865..a572625 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -302,7 +302,9 @@ class V3BWLine(object): return None kwargs['desc_avg_bw_bs'] = \ results_recent[-1].relay_average_bandwidth - kwargs['rtt'] = cls.rtt_from_results(results_recent) + rtt = cls.rtt_from_results(results_recent) + if rtt: + kwargs['rtt'] = rtt bw = cls.bw_bs_median_from_results(results_recent) kwargs['bw_bs_mean'] = cls.bw_bs_mean_from_results(results_recent) kwargs['bw_bs_median'] = cls.bw_bs_median_from_results( @@ -380,7 +382,7 @@ class V3BWLine(object): def rtt_from_results(results): # convert from miliseconds to seconds rtts = [(round(rtt * 1000)) for r in results for rtt in r.rtts] - rtt = round(median(rtts)) + rtt = round(median(rtts)) if rtts else None return rtt @staticmethod diff --git a/sbws/util/config.py b/sbws/util/config.py index 3577c5a..8ba5aac 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -236,7 +236,7 @@ def _validate_scanner(conf): sec = 'scanner' err_tmpl = Template('$sec/$key ($val): $e') ints = { - 'num_rtts': {'minimum': 1, 'maximum': 100}, + 'num_rtts': {'minimum': 0, 'maximum': 100}, 'num_downloads': {'minimum': 1, 'maximum': 100}, 'initial_read_request': {'minimum': 1, 'maximum': None}, 'measurement_threads': {'minimum': 1, 'maximum': None},

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 0c946c79f647784b22d41cb69fa7b30c821e51cc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 28 06:48:58 2018 +0000 Update translations for support-portal_completed --- contents+zh_CN.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index b612c94e8..a0bdffe70 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -419,11 +419,12 @@ msgid "" "<a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>." msgstr "" "<a href=\"https://www.torproject.org/docs/android.html.en\">Android " -"用户</a>可以通过<a href=\"https://guardianproject.info/\"> The " -"Guardian Project </a>维护的<a " -"href=\"https://guardianproject.info/apps/orbot/\"> Orbot " -"</a>和<a href=\"https://guardianproject.info/apps/orfox/\"> " -"Orfox </a>来使用 Tor 网络。" +"用户</a> 可以通过 <a href=\"https://guardianproject.info/\">The " +"Guardian Project</a> 维护的 <a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> 和 " +"<a " +"href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>来使用 Tor " +"网络。" #: http//localhost/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.seo_slug) @@ -642,8 +643,8 @@ msgid "" "Browser</a> and then using it to navigate to the blocked site will " "allow access." msgstr "" -"大多数时候，只需下载 <a href=\"https://www. Tor project.org/download/download-" -"easy.html.en\">Tor Browser</a> ，您就可以使用它去访问被屏蔽的网站。" +"大多数时候，只需下载 <a href=\"https://www.torproject.org/download/download-" +"easy.html.en\">Tor Browser</a>，您就可以使用它去访问被屏蔽的网站。" #: http//localhost/misc/misc-2/ #: (content/misc/misc-2/contents+en.lrquestion.description) @@ -2199,8 +2200,9 @@ msgid "" "and <a href=\"https://noscript.net/\">NoScript</a> — and adding" " anything else could deanonymize you." msgstr "" -"Tor Browser 已经默认安装了两个插件 —— HTTPS Everywhere 和 NoScript —— " -"再安装别的插件将会让你降低（或失去）匿名性。" +"Tor Browser 已经默认安装了两个插件 —— <a href=\"https://www.eff.org/https-" +"everywhere\">HTTPS Everywhere</a> 和 <a " +"href=\"https://noscript.net/\">NoScript</a> —— 再安装别的插件将会让你降低（或失去）匿名性。" #: http//localhost/gettor/ (content/gettor/contents+en.lrtopic.title) #: (content/gettor/contents+en.lrtopic.seo_slug) @@ -3927,7 +3929,9 @@ msgstr "Tor Browser 6.0.6 后使用 DuckDuckGo 作为内置搜索引擎。" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb-src http://deb.torproject.org/torproject.org <version> main" -msgstr "$ deb-src http://deb. Tor project.org/ Tor project.org <version> main" +msgstr "" +"$ deb-src http://deb.torproject.org/torproject.org project.org <version> " +"main" #: http//localhost/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 5311fe6d1737ffe08a046a30b6430a886d04a794 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 28 06:48:53 2018 +0000 Update translations for support-portal --- contents+zh_CN.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index b612c94e8..a0bdffe70 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -419,11 +419,12 @@ msgid "" "<a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>." msgstr "" "<a href=\"https://www.torproject.org/docs/android.html.en\">Android " -"用户</a>可以通过<a href=\"https://guardianproject.info/\"> The " -"Guardian Project </a>维护的<a " -"href=\"https://guardianproject.info/apps/orbot/\"> Orbot " -"</a>和<a href=\"https://guardianproject.info/apps/orfox/\"> " -"Orfox </a>来使用 Tor 网络。" +"用户</a> 可以通过 <a href=\"https://guardianproject.info/\">The " +"Guardian Project</a> 维护的 <a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> 和 " +"<a " +"href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>来使用 Tor " +"网络。" #: http//localhost/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.seo_slug) @@ -642,8 +643,8 @@ msgid "" "Browser</a> and then using it to navigate to the blocked site will " "allow access." msgstr "" -"大多数时候，只需下载 <a href=\"https://www. Tor project.org/download/download-" -"easy.html.en\">Tor Browser</a> ，您就可以使用它去访问被屏蔽的网站。" +"大多数时候，只需下载 <a href=\"https://www.torproject.org/download/download-" +"easy.html.en\">Tor Browser</a>，您就可以使用它去访问被屏蔽的网站。" #: http//localhost/misc/misc-2/ #: (content/misc/misc-2/contents+en.lrquestion.description) @@ -2199,8 +2200,9 @@ msgid "" "and <a href=\"https://noscript.net/\">NoScript</a> — and adding" " anything else could deanonymize you." msgstr "" -"Tor Browser 已经默认安装了两个插件 —— HTTPS Everywhere 和 NoScript —— " -"再安装别的插件将会让你降低（或失去）匿名性。" +"Tor Browser 已经默认安装了两个插件 —— <a href=\"https://www.eff.org/https-" +"everywhere\">HTTPS Everywhere</a> 和 <a " +"href=\"https://noscript.net/\">NoScript</a> —— 再安装别的插件将会让你降低（或失去）匿名性。" #: http//localhost/gettor/ (content/gettor/contents+en.lrtopic.title) #: (content/gettor/contents+en.lrtopic.seo_slug) @@ -3927,7 +3929,9 @@ msgstr "Tor Browser 6.0.6 后使用 DuckDuckGo 作为内置搜索引擎。" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb-src http://deb.torproject.org/torproject.org <version> main" -msgstr "$ deb-src http://deb. Tor project.org/ Tor project.org <version> main" +msgstr "" +"$ deb-src http://deb.torproject.org/torproject.org project.org <version> " +"main" #: http//localhost/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.description)

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 7e63476dd24ad33a93404a3a571ee57bc2befe86 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 27 23:15:22 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index c7474737b..068909439 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -6,10 +6,10 @@ # Samvel Avanesov <seavan(a)gmail.com>, 2018 # Николай Кочкин <urfiner(a)gmail.com>, 2018 # Martus Translations <translations(a)martus.org>, 2018 -# diana azaryan, 2018 +# diana azaryan <dianazryn(a)gmail.com>, 2018 msgid "" msgstr "" -"Last-Translator: diana azaryan, 2018\n" +"Last-Translator: diana azaryan <dianazryn(a)gmail.com>, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -124,12 +124,16 @@ msgstr "" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:96 msgid "We do not publish, sell, trade, or rent any information about you." msgstr "" +"Мы не публикуем, не продаем, не обмениваем и не сдаем какую-либо информацию " +"о вас." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:98 msgid "" "For our records, we retain your name, the amount of your donation, the date " "of the donation, and your contact information." msgstr "" +"Для нашего учета мы сохраняем ваше имя, сумму вашего пожертвования, дату " +"пожертвования и вашу контактную информацию." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:100 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 47a58f8bcbdf40bca3cdf8ecbe3b7661f8a85026 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 27 22:45:24 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index a5cee05d4..c7474737b 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -85,12 +85,17 @@ msgid "" "The Tor Project will never have access to your financial data, such as your " "credit card information.We aim to be careful with your information." msgstr "" +"The Tor Project никогда не будет иметь доступа к вашей финансовой " +"информации, например к информации о вашей кредитной карте. Мы стремимся быть" +" осторожными с вашей информацией." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:83 msgid "" "If you have provided your email address, we will email you once to thank you" " and give you a receipt." msgstr "" +"Если вы указали свой адрес электронной почты, мы отправим вам письмо " +"благодарности с вашей квитанцией." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:85 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 7060657e0417075a9c9d68a313d53cfcc2cc05a1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 27 20:16:01 2018 +0000 Update translations for tails-misc --- ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar.po b/ar.po index 5a6440dd3..a586ed065 100644 --- a/ar.po +++ b/ar.po @@ -30,8 +30,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-15 14:47+0200\n" -"PO-Revision-Date: 2018-10-20 09:49+0000\n" -"Last-Translator: ButterflyOfFire ButterflyOfFire\n" +"PO-Revision-Date: 2018-10-27 20:08+0000\n" +"Last-Translator: Khaled Hosny\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,7 +90,7 @@ msgstr "أ_نشئ مساحة تخزين دائمة" #: config/chroot_local-includes/usr/local/bin/electrum:57 msgid "Persistence is disabled for Electrum" -msgstr "عُطّلة ميزة الاستمرارية في إلكترم" +msgstr "ميزة التخزين الدائم معطلة في إلكترم" #: config/chroot_local-includes/usr/local/bin/electrum:59 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 46487b5ca8dda43a6201ae26ee38811ec5ee46b6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 27 20:15:19 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index 65cd20d1b..a5cee05d4 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -69,6 +69,10 @@ msgid "" " learn your name, the amount you donated, your email address, phone number " "and/or mailing address, as well as any other information you provide." msgstr "" +"Когда вы вносите пожертвование в The Tor Project, в зависимости от того, " +"какой механизм вы используете, мы можем узнать ваше имя, сумму, которую вы " +"пожертвовали, ваш адрес электронной почты, номер телефона и/или почтовый " +"адрес, а также любую другую информацию, которую вы предоставляете." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:76 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 9794e4adbeaf1f0e8560ebfc31ceaf94525ee376 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 27 19:45:20 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index 82c66b0dc..65cd20d1b 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -6,9 +6,10 @@ # Samvel Avanesov <seavan(a)gmail.com>, 2018 # Николай Кочкин <urfiner(a)gmail.com>, 2018 # Martus Translations <translations(a)martus.org>, 2018 +# diana azaryan, 2018 msgid "" msgstr "" -"Last-Translator: Martus Translations <translations(a)martus.org>, 2018\n" +"Last-Translator: diana azaryan, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -32,6 +33,9 @@ msgid "" "anonymity is by donating using a method that doesn't disclose your personal " "information." msgstr "" +"Если анонимность важна для вас, то лучший способ сохранить вашу анонимность " +"- это сделать пожертвование, используя метод, который не раскрывает вашу " +"личную информацию." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:65 msgid "" @@ -39,12 +43,18 @@ msgid "" "be collected and retained by third-party service providers and/or the Tor " "Project, as described below." msgstr "" +"Если вы предоставляете свою личную информацию в рамках процесса " +"пожертвования, она может быть собрана и сохранена сторонними поставщиками " +"услуг и/или The Tor Project, как описано ниже." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:67 msgid "" "The Tor Project has very little influence over how third-party service " "providers, such as PayPal, may collect and use your information." msgstr "" +"The Tor Project оказывает весьма незначительное влияние на то, как сторонние" +" поставщики услуг, например PayPal, могут собирать и использовать вашу " +"информацию." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:69 msgid ""

1 0