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

[metrics-lib/master] Remove Cobertura from the build process.
by karsten＠torproject.org 12 Aug '19

12 Aug '19

commit 53b16d192da4a7fa5c1987a89a60257061602882 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 12 09:34:04 2019 +0200 Remove Cobertura from the build process. --- CHANGELOG.md | 1 + src/build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 560ee96..b804ceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ copied to the `lib/` directory manually. Current dependency versions … [View More]

1 0

[metrics-base/master] Remove Cobertura from the build process.
by karsten＠torproject.org 12 Aug '19

12 Aug '19

commit 75cda35ba7375ab0f5b12fa214620c3a29917097 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 12 09:23:47 2019 +0200 Remove Cobertura from the build process. We're having trouble with Cobertura and Java 8, most likely due to it not being maintained anymore. We're removing it now and will be replacing it with something else later. Resolves #31361. --- java/base.xml | 60 ----------------------------------------------------------- java/… [View More]ivy.xml | 1 - 2 files changed, 61 deletions(-) diff --git a/java/base.xml b/java/base.xml index fc4cc6c..8342e91 100644 --- a/java/base.xml +++ b/java/base.xml @@ -13,10 +13,7 @@ <property name="testsources" value="src/test/java"/> <property name="testresources" value="src/test/resources/"/> <property name="testresult" value="${generated}/test-results"/> - <property name="coverageresult" value="${generated}/coverage-report/"/> - <property name="instrument" value="${generated}/instrument/"/> <property name="testclasses" value="${generated}/testclasses/"/> - <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> <property name="jarfile" value="${name}-${release.version}.jar" /> <property name="jarthinfile" value="${name}-${release.version}-thin.jar" /> @@ -68,35 +65,12 @@ </fileset> </path> - <path id="cobertura.classpath"> - <fileset dir="${libs}"> - <include name="cobertura-2.1.1.jar" /> - <include name="slf4j-api-1.7.22.jar" /> - <include name="commons-lang3-3.5.jar" /> - <include name="asm-5.0.1.jar" /> - <include name="asm-util-5.0.1.jar" /> - <include name="asm-tree-5.0.1.jar" /> - <include name="asm-commons-5.0.1.jar" /> - <include name="asm-analysis-5.0.1.jar" /> - <include name="oro-2.0.8.jar" /> - <include name="logback-core-1.1.9.jar" /> - <include name="logback-classic-1.1.9.jar" /> - </fileset> - </path> - - <path id="cobertura.test.classpath"> - <path location="${instrument}" /> - <path refid="test.classpath" /> - <path refid="cobertura.classpath" /> - </path> -  <target name="clean" > <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${generated}" defaultexcludes="false" includes="**" /> </delete> - <delete file="${cobertura.ser.file}" quiet="true" /> </target> <target name="usage"> @@ -107,7 +81,6 @@ <echo message="'test' runs all tests (see ${testresult})." /> <echo message="'docs' creates all javadoc in ${docs}." /> <echo message="'checks' checks coding style (see ${generated}/checkstyle_report.txt)." /> - <echo message="'coverage' checks coverage (see ${coverageresult})." /> <echo message="'tar' creates a release tarball in ${dist}." /> </target> @@ -125,7 +98,6 @@ <mkdir dir="${testclasses}"/> <mkdir dir="${docs}"/> <mkdir dir="${testresult}"/> - <mkdir dir="${instrument}"/> <mkdir dir="${dist}"/> <manifest file="${emptymanifest}" /> </target> @@ -353,35 +325,3 @@ </tar> </target> - <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> - <target name="coverage" depends="compile,testcompile"> - <delete file="${cobertura.ser.file}" quiet="true" /> - <copy todir="${instrument}" > - <fileset dir="${classes}"/> - </copy> - <cobertura-instrument ignoreTrivial="true"> - <fileset dir="${instrument}"> - <include name="**/**/*.class" /> - </fileset> - </cobertura-instrument> - <junit fork="true" haltonfailure="false" printsummary="on"> - <sysproperty key="net.sourceforge.cobertura.datafile" - file="${cobertura.ser.file}" /> - <jvmarg value="-DLOGBASE=${generated}/testcoverage-logs"/> - <jvmarg value="-Djava.security.policy=${buildresources}/junittest.policy"/> - <jvmarg value="-Djava.security.manager"/> - <classpath refid="cobertura.test.classpath" /> - <formatter type="xml" /> - <batchtest toDir="${testresult}" > - <fileset dir="${testclasses}" - includes="**/*Test.class"/> - </batchtest> - </junit> - <cobertura-report format="html" destdir="${coverageresult}" > - <fileset dir="${sources}"> - <include name="**/*.java" /> - </fileset> - </cobertura-report> - <antcall target="coverage-check" /> - </target> - diff --git a/java/ivy.xml b/java/ivy.xml index 79ce408..e5f07aa 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -21,7 +21,6 @@  <dependency org="com.puppycrawl.tools" name="checkstyle" rev="6.17" /> - <dependency org="net.sourceforge.cobertura" name="cobertura" rev="2.1.1" />  <dependency org="javax.servlet" name="javax.servlet-api" rev="3.1.0" /> [View Less]

1 0

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

12 Aug '19

commit 7d6e75acc6ee51175360751d1f6b70705757393e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 07:21:37 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f952eac3d..16e138d09 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -322,6 +322,8 @@ msgid "" "For example, `torbrowser-… [View More]install-win64-8.5.4_en-US.exe` is accompanied by " "`torbrowser-install-win64-8.5.4_en-US.exe.asc`." msgstr "" +"例如，“torbrowser-install-win64-8.5.4_en-US.exe”会附带“torbrowser-install-" +"win64-8.5.4_en-US.exe.asc”。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -354,7 +356,7 @@ msgstr "只要您验证了签名，就不必担心报告的日期可能有所不 #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Installing GnuPG" -msgstr "" +msgstr "### 正在安装GnuPG" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -366,21 +368,21 @@ msgstr "首先你需要安装GnuPG才能验证签名。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Windows users:" -msgstr "" +msgstr "#### 对于Windows的用户：" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "If you run Windows, [download Gpg4win](https://gpg4win.org/download.html) " "and run its installer." -msgstr "" +msgstr "如果您使用Windows， [下载 Gpg4win](https://gpg4win.org/download.html)并运行其安装包。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "In order to verify the signature you will need to type a few commands in " "windows command-line, `cmd.exe`." -msgstr "" +msgstr "为了验证签名，您需要在Windows命令行（“cmd.exe\"）中输入一些命令。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -392,7 +394,7 @@ msgstr "#### 对于macOS的用户：" msgid "" "If you are using macOS, you can [install " "GPGTools](https://www.gpgtools.org)." -msgstr "" +msgstr "如果您正在使用macOS，您可以[安装 GPGTools](https://www.gpgtools.org)。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -404,7 +406,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For GNU/Linux users:" -msgstr "" +msgstr "#### 对于 GNU/Linux 的用户：" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -505,7 +507,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Verifying the signature" -msgstr "" +msgstr "### 验证签名" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -526,17 +528,17 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "The result of the command should produce something like this:" -msgstr "" +msgstr "命令的结果应该与以下输出相似的内容：" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time" -msgstr "" +msgstr "gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpgv: using RSA key EB774491D9FF06E2" -msgstr "" +msgstr "gpgv: using RSA key EB774491D9FF06E2" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -544,6 +546,8 @@ msgid "" "gpgv: Good signature from \"Tor Browser Developers (signing key) " "<torbrowser(a)torproject.org>\"" msgstr "" +"gpgv: Good signature from \"Tor Browser Developers (signing key) " +"<torbrowser(a)torproject.org>\"" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -551,6 +555,8 @@ msgid "" "gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.4_en-" "US.exe.asc Downloads\torbrowser-win64-install-8.5.4_en-US.exe" msgstr "" +"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.4_en-" +"US.exe.asc Downloads\torbrowser-win64-install-8.5.4_en-US.exe" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) [View Less]

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 12 Aug '19

12 Aug '19

commit 65904c25dba85044a65ff86874b27cad400c0ba2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 07:21:16 2019 +0000 Update translations for tpo-web_completed --- contents+zh-CN.po | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index d0b82fd0d..072bfe4ab 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -240,6 +240,9 @@ msgid "" "advocate for privacy protections, and build … [View More]important free, open source " "technologies that prioritize privacy." msgstr "" +"_Cy " +"pres_奖项是美国集体诉讼和解的一部分分配资金。当资金总额不能分配给所有成员时，可以分配给代表组织成员的非营利组织、倡导组织和研究小组。消费者隐私权大奖可以帮助Tor" +" 项目保护个人和组织的在线隐私权，倡导隐私保护，以及建立重要的优先考虑隐私权的免费开源技术。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -251,7 +254,7 @@ msgstr "### 关于Tor 项目" msgid "" "The Tor Project is a U.S.-based 501(3) nonprofit founded in 2006 with the " "mission of advancing human rights and freedoms by:" -msgstr "" +msgstr "Tor 项目是一个基于美国501(3)的非盈利项目，它在2006年成立，旨在通过以下方面来完成提升人权与自由的任务：" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -275,7 +278,7 @@ msgid "" "The Tor Project and its surrounding community develops and distributes some " "of the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." -msgstr "" +msgstr "Tor 项目及其周边社区开发，分发一些最流行与被广泛使用的免费开源隐私技术：Tor 浏览器和Tor 网络。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -285,6 +288,8 @@ msgid "" "journalists, human rights defenders, librarians, consumers, and average " "internet users about how to protect and retain their privacy online." msgstr "" +"除了开发技术之外，该组织还帮助人们保护在线隐私。Tor " +"项目已经向成千上万的活动家、记者、人权维护者、图书管理员、消费者和普通互联网用户提供了在线的隐私保护。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -307,6 +312,8 @@ msgid "" "Defense Advanced Research Projects Agency (DARPA); and the Media Democracy " "Fund." msgstr "" +"过去，Tor 项目一直是通过 Rose Foundation's Consumer Privacy组织的拨款赢得_cy " +"pres_奖项。该组织拥有超过十年的经验，成功地与美国国务院（美国民主、人权和劳工局）、国家科学基金会、国防高级研究计划署（DARPA）和媒体民主基金等不同的项目和合作伙伴成功地开展项目。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) [View Less]

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 12 Aug '19

12 Aug '19

commit 251c67870a1d9becccd1a6a5740a04ec5f0fa3ee Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 07:21:10 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index d0b82fd0d..072bfe4ab 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -240,6 +240,9 @@ msgid "" "advocate for privacy protections, and build important … [View More]free, open source " "technologies that prioritize privacy." msgstr "" +"_Cy " +"pres_奖项是美国集体诉讼和解的一部分分配资金。当资金总额不能分配给所有成员时，可以分配给代表组织成员的非营利组织、倡导组织和研究小组。消费者隐私权大奖可以帮助Tor" +" 项目保护个人和组织的在线隐私权，倡导隐私保护，以及建立重要的优先考虑隐私权的免费开源技术。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -251,7 +254,7 @@ msgstr "### 关于Tor 项目" msgid "" "The Tor Project is a U.S.-based 501(3) nonprofit founded in 2006 with the " "mission of advancing human rights and freedoms by:" -msgstr "" +msgstr "Tor 项目是一个基于美国501(3)的非盈利项目，它在2006年成立，旨在通过以下方面来完成提升人权与自由的任务：" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -275,7 +278,7 @@ msgid "" "The Tor Project and its surrounding community develops and distributes some " "of the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." -msgstr "" +msgstr "Tor 项目及其周边社区开发，分发一些最流行与被广泛使用的免费开源隐私技术：Tor 浏览器和Tor 网络。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -285,6 +288,8 @@ msgid "" "journalists, human rights defenders, librarians, consumers, and average " "internet users about how to protect and retain their privacy online." msgstr "" +"除了开发技术之外，该组织还帮助人们保护在线隐私。Tor " +"项目已经向成千上万的活动家、记者、人权维护者、图书管理员、消费者和普通互联网用户提供了在线的隐私保护。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -307,6 +312,8 @@ msgid "" "Defense Advanced Research Projects Agency (DARPA); and the Media Democracy " "Fund." msgstr "" +"过去，Tor 项目一直是通过 Rose Foundation's Consumer Privacy组织的拨款赢得_cy " +"pres_奖项。该组织拥有超过十年的经验，成功地与美国国务院（美国民主、人权和劳工局）、国家科学基金会、国防高级研究计划署（DARPA）和媒体民主基金等不同的项目和合作伙伴成功地开展项目。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) [View Less]

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 12 Aug '19

12 Aug '19

commit 216bc002c2bc506f232d1c76b441073bf37dee22 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 06:50:50 2019 +0000 Update translations for tpo-web_completed --- contents+zh-CN.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 9c09d8a1b..d0b82fd0d 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -293,6 +293,8 @@ msgid "" "[often turned to by the media for information about how individuals … [View More]

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 12 Aug '19

12 Aug '19

commit 40e89ea6d0970ff6266e9d224be4e62b5cdf6513 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 06:50:43 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 9c09d8a1b..d0b82fd0d 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -293,6 +293,8 @@ msgid "" "[often turned to by the media for information about how individuals and " "… [View More]

1 0

[translation/orfox-stringsxml_completed] Update translations for orfox-stringsxml_completed
by translation＠torproject.org 12 Aug '19

12 Aug '19

commit e9e1ff13a966a2a645e8868554aaafc426c0fd18 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 04:46:38 2019 +0000 Update translations for orfox-stringsxml_completed --- ja/strings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ja/strings.xml b/ja/strings.xml new file mode 100644 index 000000000..7a06411c9 --- /dev/null +++ b/ja/strings.xml @@ -0,0 +1,9 @@ +<resources> + <string name="app_name">OrfoxRIP</string… [View More]

1 0

[translation/orfox-stringsxml] Update translations for orfox-stringsxml
by translation＠torproject.org 12 Aug '19

12 Aug '19

commit 59c887df38e219c0a84ac9b47877c4870daa3f36 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 12 04:46:30 2019 +0000 Update translations for orfox-stringsxml --- ja/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/ja/strings.xml b/ja/strings.xml index 7beb9dead..7a06411c9 100644 --- a/ja/strings.xml +++ b/ja/strings.xml @@ -1,4 +1,5 @@ <resources> + <string name="app_name">OrfoxRIP</string> <string name="… [View More]

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 31fb2bceb546fb84899e5c797e3f101b86dd8687 Merge: 789fdbed0 c09e7a4e7 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:53:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5 changes/bug29875 | 11 +++++++++++ src/app/config/config.c | 3 ++- src/feature/client/entrynodes.c | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-)

1 0