August 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 06 Aug '19

06 Aug '19

commit 88f9b123d6d929d2f783ba7823b7c289c09d83e0 Merge: d7afdb3b0 21531f35f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 6 09:19:11 2019 -0400 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge branch 'ticket31311_041' into maint-0.4.1
by nickm＠torproject.org 06 Aug '19

06 Aug '19

commit 21531f35f3c6d7d7a86f474e5a2a4ff02388bea0 Merge: 74c059596 394528241 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 6 09:19:05 2019 -0400 Merge branch 'ticket31311_041' into maint-0.4.1 Makefile.am | 9 ++++++--- changes/ticket31311 | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 377d0cbd51435ec5a4b2dee71187fbaf80522c69 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 15:15:13 2019 +0000 Update translations for abouttor-homepage_completed --- it/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index 56782439e..6178c8eb9 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -28,8 +28,8 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> -<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor grande."> -<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso"> <!ENTITY aboutTor.donationBanner3.line1 "Le donazioni mensili automatiche mantengono Tor forte."> <!ENTITY aboutTor.donationBanner3.line2 "Diventa un Difensore della Privacy oggi.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 8b839e31421a95b2a3a09fd4b4fec436064bbf7e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 15:15:06 2019 +0000 Update translations for abouttor-homepage --- it/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index 56782439e..6178c8eb9 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -28,8 +28,8 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> -<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor grande."> -<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso"> <!ENTITY aboutTor.donationBanner3.line1 "Le donazioni mensili automatiche mantengono Tor forte."> <!ENTITY aboutTor.donationBanner3.line2 "Diventa un Difensore della Privacy oggi.">

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 9fe3bc948e07bee9432bb46a5b6c6b06cf162a9d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 14:50:46 2019 +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 938b626fe..e12eeb47c 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -803,7 +803,7 @@ msgid "" "The default setting in the Windows installer also creates a shortcut for you" " on your Desktop, though be aware that you may have accidentally deselected " "the option to create a shortcut." -msgstr "" +msgstr "Windows安装包中的默认设置也会为您在您的桌面上创建一个快捷方式，但请注意，您可能无意中取消了创建快捷方式的选项。" #: https//support.torproject.org/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -3935,7 +3935,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### hidden services" -msgstr "" +msgstr "### 隐身服务" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3943,11 +3943,13 @@ msgid "" "Former name for \"[onion services](#onion-services)\", sometimes still in " "use in [Tor](#tor-/-tor-network/-core-tor) documentation or communication." msgstr "" +"\"[onion services](#onion-services)\"的曾用名，有时仍在 [Tor](#tor-/-tor-network" +"/-core-tor)里被使用。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### hop" -msgstr "" +msgstr "### 跳" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3989,7 +3991,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### HTTPS Everywhere" -msgstr "" +msgstr "### HTTPS Everywhere" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4524,7 +4526,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "This is the key that can be disseminated to others." -msgstr "" +msgstr "这是一个可以被传递给他人的密钥。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4542,6 +4544,8 @@ msgid "" "The [public key](#public-key) can be disseminated widely while its belonging" " [private key](#private-key) is known only by the owner of the key pair." msgstr "" +"公钥[public key](#public-key)会被广泛地传递，而它所属的私钥[private key](#private-" +"key)仅被这对密钥的所属者所知晓。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4648,14 +4652,14 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### server" -msgstr "" +msgstr "### 服务器" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "" "A device on a network which offers a service, such as file and web page " "storage, email or chat." -msgstr "" +msgstr "一个在网络的中设备用于提供服务，例如文件与网页的存储，邮件或聊天。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4991,7 +4995,7 @@ msgstr "### torrc" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "The core [Tor](#tor-/-tor-network/-core-tor) configuration file." -msgstr "" +msgstr "[Tor](#tor-/-tor-network/-core-tor)的核心配置文件。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5003,7 +5007,7 @@ msgstr "### Torsocks" msgid "" "Torsocks allows you to use many applications in a safer way with [Tor](#tor" "-/-tor-network/-core-tor)." -msgstr "" +msgstr "Torsocks能够让你通过[Tor](#tor-/-tor-network/-core-tor)以一种更安全的方式来使用很多应用。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5041,7 +5045,7 @@ msgstr "### TPI" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "TPI is an acronym for The Tor Project, Inc." -msgstr "" +msgstr "TPI是The Tor Project, Inc的首字母缩写。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 423f79e001b255ed4c8154659f66d2e3cd620a7b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 14:20:57 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index ccd40d1ab..938b626fe 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3147,7 +3147,7 @@ msgstr "" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb-src https://deb.torproject.org/torproject.org version main" -msgstr "" +msgstr "$ deb-src https://deb.torproject.org/torproject.org version main" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -3163,6 +3163,9 @@ msgid "" "https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" " | sudo apt-key add -" msgstr "" +"$ curl " +"https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" +" | sudo apt-key add -" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -3329,7 +3332,7 @@ msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion ico msgid "" "And if you're accessing a website with HTTPS and onion service, it will show" " an icon of a green onion and a padlock." -msgstr "" +msgstr "并且如果您正在通过HTTPS协议访问一个支持洋葱服务的网站，浏览器会显示绿色的洋葱和安全锁的图标。" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -4154,13 +4157,15 @@ msgid "" "information such as [cookies](#cookie) and [browsing history](#browsing-" "history), and use New [Tor circuits](#circuit) for all connections." msgstr "" +"选择该选项将关闭所有已经打开的浏览器标签页与窗口，清除所有个人信息，例如[cookies](#cookie)和[browsing history" +"](#browsing-history)，并且对于所有连接使用新的[Tor circuits](#circuit)。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "" "Tor Browser will warn you that all activity and downloads will be stopped, " "so take this into account before clicking “New Identity”." -msgstr "" +msgstr "Tor 浏览器会警告你所有活动与下载将被停止，所以在点击“新身份”前请考虑这一点。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4169,6 +4174,8 @@ msgid "" "particular site, similarly to \"[New Tor Circuit for this Site](#new-tor-" "circuit-for-this-site)\"." msgstr "" +"新的身份也可以帮助判断Tor 浏览器是否会在连接一个特定网站时出现问题，类似于\"[New Tor Circuit for this Site" +"](#new-tor-circuit-for-this-site)\"。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit f12121e558e909e65cfc70baeb314e10ec7c2f67 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 14:15:12 2019 +0000 Update translations for abouttor-homepage_completed --- ar/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index 1e7bb131c..64e44b7a8 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.viewChangelog.label "الإطلاع على سجل التغيرات"> -<!ENTITY aboutTor.ready.label "تصفح بهوية خفية"> +<!ENTITY aboutTor.ready.label "تصفح بكل خصوصية."> <!ENTITY aboutTor.ready2.label "أنت جاهز الآن لتجربة التصفح الأكثر خصوصية في العالم."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> @@ -32,4 +32,4 @@ <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> <!ENTITY aboutTor.donationBanner3.line1 "تبرعات شهرية أتوماتيكية حافظ على Tor قويا."> -<!ENTITY aboutTor.donationBanner3.line2 "كن مدافعا عن الخصوصية اليوم."> +<!ENTITY aboutTor.donationBanner3.line2 "اصبح مدافعا عن الخصوصية اليوم.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 47f93a3107dd0bbf9ed5ddfb5e7125b3893c98f2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 14:15:05 2019 +0000 Update translations for abouttor-homepage --- ar/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index 1e7bb131c..64e44b7a8 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.viewChangelog.label "الإطلاع على سجل التغيرات"> -<!ENTITY aboutTor.ready.label "تصفح بهوية خفية"> +<!ENTITY aboutTor.ready.label "تصفح بكل خصوصية."> <!ENTITY aboutTor.ready2.label "أنت جاهز الآن لتجربة التصفح الأكثر خصوصية في العالم."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> @@ -32,4 +32,4 @@ <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> <!ENTITY aboutTor.donationBanner3.line1 "تبرعات شهرية أتوماتيكية حافظ على Tor قويا."> -<!ENTITY aboutTor.donationBanner3.line2 "كن مدافعا عن الخصوصية اليوم."> +<!ENTITY aboutTor.donationBanner3.line2 "اصبح مدافعا عن الخصوصية اليوم.">

1 0

[metrics-lib/master] Use Ivy for resolving external dependencies.
by karsten＠torproject.org 06 Aug '19

06 Aug '19

commit e1728709b5ed30dace2dd5b7e47a3e3c5e9e5736 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Aug 3 11:57:02 2019 +0200 Use Ivy for resolving external dependencies. Includes an upgrade to the latest metrics-base commit 256e619. Implements part of #31326. --- CHANGELOG.md | 14 ++++++++++++++ build.xml | 3 ++- src/build | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d250e..560ee96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# Changes in version 2.7.0 - 2019-0?-?? + + * Medium changes + - Use Ivy for resolving external dependencies rather than relying + on files found in Debian stable packages. Requires installing Ivy + (using `apt-get install ivy`, `brew install ivy`, or similar) and + running `ant resolve` (or `ant -lib /usr/share/java resolve`). + Retrieved files are then copied to the `lib/` directory, except + for dependencies on other metrics libraries that still need to be + copied to the `lib/` directory manually. Current dependency + versions resolved by Ivy are the same as in Debian stretch with + few exceptions. + + # Changes in version 2.6.2 - 2019-05-29 * Medium changes diff --git a/build.xml b/build.xml index 3066e90..f319cf0 100644 --- a/build.xml +++ b/build.xml @@ -4,7 +4,8 @@ <!ENTITY base SYSTEM "src/build/java/base.xml"> ]> -<project default="usage" name="metrics-lib" basedir="."> +<project default="usage" name="metrics-lib" basedir="." + xmlns:ivy="antlib:org.apache.ivy.ant"> <property name="release.version" value="2.6.2-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> diff --git a/src/build b/src/build index ed48192..256e619 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b +Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 0709b4630c083a22a8c2450896046aa7ce683209 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 13:51:23 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f04fc99d1..ccd40d1ab 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -8,6 +8,7 @@ # Emma Peel, 2019 # ff98sha, 2019 # crisp box <aboxofcrisp(a)gmail.com>, 2019 +# 陈俊融 <heige.pcloud(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -15,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-31 14:11+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: crisp box <aboxofcrisp(a)gmail.com>, 2019\n" +"Last-Translator: 陈俊融 <heige.pcloud(a)gmail.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -559,7 +560,7 @@ msgstr "最好的方式是去见开发者本人然后交换密钥指纹。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### macOS and Linux" -msgstr "" +msgstr "### macOS和Linux" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -613,7 +614,7 @@ msgstr "假设你已经下载了这个包和它的签名到了你的下载文件 #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For macOS users:" -msgstr "" +msgstr "#### 对于macOS的用户：" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -681,6 +682,9 @@ msgid "" "out <a href=\"https://blog.torproject.org\">blog.torproject.org</a> for a " "post on the most recent stable Tor Browser to see if your issue is listed." msgstr "" +"如果您在升级了Tor 浏览器后遇到了问题，请在<a " +"href=\"https://blog.torproject.org\">blog.torproject.org</a>查阅有关最新稳定版本的Tor " +"浏览器的博客，您的问题可能被包含在其中。" #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -741,7 +745,7 @@ msgstr "* obfs4proxy.exe （如果你使用网桥）" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* For macOS" -msgstr "" +msgstr "*对于macOS" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -2182,7 +2186,7 @@ msgstr "* Linux" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* macOS (OS X)" -msgstr "" +msgstr "* macOS (OS X)" #: https//support.torproject.org/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.description) @@ -3178,7 +3182,7 @@ msgstr "$ sudo apt-get install tor deb.torproject.org-keyring" #: https//support.torproject.org/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.title) msgid "How do I run an obfs4 bridge?" -msgstr "" +msgstr "我该如何搭建一个obfs4的网桥？" #: https//support.torproject.org/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) @@ -3187,6 +3191,9 @@ msgid "" "href=\"https://community.torproject.org/relay/setup/bridge/\">obfs4 setup " "guide</a></mark> to learn how to set up an obfs4 bridge." msgstr "" +"请查阅我们的<mark><a " +"href=\"https://community.torproject.org/relay/setup/bridge/\">obfs4 setup " +"guide</a></mark>来了解如何搭建一个obfs4的网桥" #: https//support.torproject.org/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title)

1 0