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

[translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 93bf9258ea3c6c741ac60a4172fe747226709420 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 11:23:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- sw/sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index c3e1d034c..bf881bd90 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2019-04-29 19:07+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-09-12 11:22+0000\n" +"Last-Translator: Louis Lloyd <louislloyd12(a)gmail.com>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -215,7 +215,7 @@ msgstr "" #: ../data/whisperback.ui.h:31 msgid "Send" -msgstr "" +msgstr "tuma" #: ../data/whisperback.desktop.in.h:1 msgid "WhisperBack Error Reporting"

1 0

[metrics-web/master] Update CollecTor page to include snowflake stats.
by karsten＠torproject.org 12 Sep '19

12 Sep '19

commit 412ac16376bb93e9be80b776a64435940f16681d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 14 10:58:38 2019 +0200 Update CollecTor page to include snowflake stats. Implements #29461. --- src/main/resources/web/jsps/collector.jsp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp index a05b7e0..42280a9 100644 --- a/src/main/resources/web/jsps/collector.jsp +++ b/src/main/resources/web/jsps/collector.jsp @@ -196,6 +196,15 @@ <td><a href="/collector/recent/relay-descriptors/bandwidths/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> <a href="/collector/archive/relay-descriptors/bandwidths/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> +<tr class="tableHeadline"> + <td colspan="3"><b><a href="#snowflake-stats">Snowflake Statistics</a></b></td> +</tr> +<tr> + <td><a href="#type-snowflake-stats">Snowflake Statistics</a></td> + <td><code>@type snowflake-stats 1.0</code></td> + <td><a href="/collector/recent/snowflakes/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="/collector/archive/snowflakes/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> +</tr> </tbody> </table> @@ -792,6 +801,21 @@ These are available from a DirPort's </p> +<br> +<h2 id="snowflake-stats" class="hover">Snowflake Statistics +<a href="#snowflake-stats" class="anchor">#</a> +</h2> + +<h3 id="type-snowflake-stats" class="hover">Snowflake Statistics +<small><code>@type snowflake-stats 1.0</code></small> +<a href="/collector/recent/snowflakes/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="/collector/archive/snowflakes/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="#type-snowflake-stats" class="anchor">#</a> +</h3> + +<p> +Snowflake statistics containing aggregated information about snowflake proxies and snowflake clients as generated by the snowflake broker. +</p> </div> <br>

1 0

[tpo/master] Direct users to question about TBA on F-Droid
by gus＠torproject.org 12 Sep '19

12 Sep '19

commit db771d951bc58bdf21deec35b407e30654d6e0b1 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Mon Sep 9 10:25:29 2019 -0400 Direct users to question about TBA on F-Droid will-fix: https://dip.torproject.org/web/tpo/issues/24 --- templates/download-android.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/download-android.html b/templates/download-android.html index 71eb856..e11a3f5 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -23,7 +23,7 @@ <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>sig</small></a> <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser">{{ _('Go to Google Play') }}</a> {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-block btn-lg btn-light text-primary disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://support.torproject.org/tormobile/tormobile-7/">{{ _('Go to F-Droid') }}</a>  </div> </div>

1 0

[tpo/master] Merge branch 'fix-24-update-fdroid-link'
by gus＠torproject.org 12 Sep '19

12 Sep '19

commit a6c15f8fed4d76ea2482e401ef7ff141e47b972c Merge: 9e8bd6e db771d9 Author: gus <gus(a)torproject.org> Date: Wed Sep 11 17:16:41 2019 -0400 Merge branch 'fix-24-update-fdroid-link' Fix https://dip.torproject.org/web/tpo/issues/24 templates/download-android.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 97ad8ebbb8bdec933c42d60227202e5d727d7d8a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 09:17:19 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- ml/index.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ml/index.html b/ml/index.html index 912f5c8bc..ae30c70c6 100644 --- a/ml/index.html +++ b/ml/index.html @@ -50,28 +50,28 @@ <h3>ബഗ്‌സ് അറിയിക്കുന്നു </h3> - <p>If you encounter problems with Snowflake as a client or a proxy, - please consider filing a bug. To do so, you will have to,</p> + <p>നിങ്ങൾ സ്നോ ഫ്ളൈക് ഇൽ ഒരു ക്ലയന്റ് ആയോ പ്രോക്സി ആയോ ഒരു പ്രേസനം നേരിടുകയാണെങ്കിൽ , +ദയവായി ബഗ്‌സ് അറിയിക്കുക . അങ്ങനെ ചെയ്യണമെങ്കിൽ, നിങ്ങൾ ചെയ്യേണ്ടത് </p> <ol> -<li>Either <a href="https://trac.torproject.org/projects/tor/register">create an - account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> - using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> +<li>ഒന്നെങ്കിൽ<a href="https://trac.torproject.org/projects/tor/register"> ഒരു അക്കൗണ്ട് +നിർമാണം </a>ചെയ്യുക അല്ലെങ്കിൽ <a href="https://trac.torproject.org/projects/tor/login">പങ്കിട്ടെടുക്കുന്ന </a> +<b>സൈഫർ പങ്ക് </b>അക്കൗണ്ട് ഉം പാസ്സ്‌വേർഡും<b> വറൈറ്റ് കോടും </b>.</li> <li> -<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> - using our bug tracker.</li> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">ഒരു ടിക്കറ്റ് </a> +ഉപയോഗിച്ച ബഗ്‌സ് ബോധിപ്പിക്കുക .</li> </ol> -<p>Please try to be as descriptive as possible with your ticket and if - possible include log messages that will help us reproduce the bug. - Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> - to let us know how which part of the Snowflake system is experiencing - problems.</p> +<p>ദയവായി നിങ്ങളുടെ ടിക്കറ്റ് +വെച്ച് വളരെ അധികം വിശദീകരിക്കാൻ പറ്റുമെങ്കിൽ വിശദീകരിക്കുക കൂടാതെ പറ്റുമെങ്കിൽ ലോഗ് സന്ദേശങ്ങളും കൂട്ടത്തിൽ ചേർക്കുക അത് ഞങ്ങള്ക് ബഗ്‌സ് +പുനര്നിര്മാണത്തിനു സഹായിക്കും . സനൗ ഫ്‌ളൈക് ന്റെ ഏതു ഭാഗത്താണ് പ്രേസനം +എന്ന് ഞങ്ങളെ അറിയിക്കുമ്പോൾ <em>സനൗ ഫ്‌ളൈക് വെബ് എക്സ്റ്റൻഷൻ </em>അല്ലെങ്കിൽ <em>സനൗ ഫ്‌ളൈക് ക്ലയന്റ് </em> +വാക്യങ്ങൾ കൂട്ടിച്ചേർക്കുന്നതിനെപ്പറ്റി ആലോചിക്കുക .</p> - <h3>EMBED</h3> + <h3>എംബെഡ് </h3> - <p>It is now possible to embed the Snowflake badge on any website:</p> + <p>ഇപ്പോൾ സനൗ ഫ്‌ളൈക് ന്റെ തിലകം ഏതു വെബ്സൈറ്റ് ലും എംബെഡ് ചെയ്യാൻ സാദ്ധ്യമാണ് :</p> - <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p>Which looks like this:</p> + <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p>അത് ഇങ്ങനെ കാണാൻ സാധിക്കും :</p> <iframe src="index_files/embed.html" scrolling="no" width="320px" height="200px" frameborder="0"></iframe>

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 922ceec4256b763078c988280cf22be7d157e311 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 09:15:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ja/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index 339848eb2..cd555fd4b 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -27,6 +27,6 @@ <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。"> -<!ENTITY aboutTor.newsletter.link_text "Torニュースにを申し込む。"> +<!ENTITY aboutTor.newsletter.link_text "Torニュースに申し込む。"> <!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。"> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">

1 0

[collector/master] Bump version to 1.10.0-dev.
by karsten＠torproject.org 12 Sep '19

12 Sep '19

commit 16894a4d0096ac76e0ccbba1cd7b593ab1ddab2c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 12 10:59:05 2019 +0200 Bump version to 1.10.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f4812c4..4bada49 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.10.0" /> + <property name="release.version" value="1.10.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.7.0" />

1 0

[collector/release] Add change log entry for Cobertura deps.
by karsten＠torproject.org 12 Sep '19

12 Sep '19

commit 7f36a2b12eb5e25c441e0d8a40c5c9a7de19821c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 24 19:56:18 2019 +0200 Add change log entry for Cobertura deps. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55118c2..3a07711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, commons-collections3-3.2.2.jar, commons-logging-1.2.jar, guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + * Update Cobertura dependencies to versions found in Debian buster, + including: asm4-5.0.4.jar, asm4-util-5.0.4.jar, + asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar, + asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar # Changes in version 1.9.1 - 2019-05-29

1 0

[collector/release] Upgrade to latest metrics-base.
by karsten＠torproject.org 12 Sep '19

12 Sep '19

commit 02b709b65eb8679020e9af67905640a46c362fec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 24 19:08:55 2019 +0200 Upgrade to latest metrics-base. Also include change log entries and fix a few Checkstyle complaints. --- CHANGELOG.md | 16 ++++++++++++++++ src/build | 2 +- .../java/org/torproject/metrics/collector/conf/Key.java | 4 +++- .../metrics/collector/webstats/SanitizeWeblogs.java | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4682fef..55118c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# Changes in version 1.10.0 - 2019-0?-?? + + * Medium changes + * Update build-time and run-time dependencies to versions found in + Debian buster, including: commons-codec-1.11.jar, + commons-compress-1.18.jar, jackson-annotations-2.9.8.jar, + jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar, + logback-core-1.2.3.jar, logback-classic-1.2.3.jar, + slf4j-api-1.7.25.jar, and xz-1.8.jar. + * Update Checkstyle dependencies to versions found in Debian + buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar, + checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, + commons-collections3-3.2.2.jar, commons-logging-1.2.jar, + guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + + # Changes in version 1.9.1 - 2019-05-29 * Medium changes diff --git a/src/build b/src/build index e12ba96..42ee1fc 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit e12ba96aa0708b20375cf7cf5d20dfa19940d18a +Subproject commit 42ee1fc086b0e86cddf56475124a547465484321 diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java index ba4bcd9..32e20ce 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -72,7 +72,9 @@ public enum Key { private static Set<String> keys; /** - * @param Class of key value. + * Instantiate a new {@code Key} using the given class for the key value. + * + * @param clazz Class of key value. */ Key(Class clazz) { this.clazz = clazz; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index 027cfde..539194e 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -166,7 +166,7 @@ public class SanitizeWeblogs extends CollecTorMain { private static final int BATCH = 100_000; static byte[] toCompressedBytes(Map<String, Long> lines) - throws DescriptorParseException { + throws DescriptorParseException { try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); OutputStream os = FileType.XZ.outputStream(baos)) { for (Map.Entry<String, Long> entry : lines.entrySet()) {

1 0

[collector/release] Revert all Debian buster library upgrades.
by karsten＠torproject.org 12 Sep '19

12 Sep '19

commit 6ad185caeaafa3c67113cb6ea6290e984feda6ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 28 21:50:09 2019 +0200 Revert all Debian buster library upgrades. Turns out that updating all dependencies, including those in metrics-web and exonerator using servlets and JSPs, is much harder than expected. We decided to revert all these changes for now, so that we can merge patches again. We're going to investigate alternatives like Ant + Ivy, Maven, or Gradle in the near future. --- CHANGELOG.md | 20 -------------------- build.xml | 18 +++++++++--------- src/build | 2 +- .../org/torproject/metrics/collector/conf/Key.java | 4 +--- .../metrics/collector/webstats/SanitizeWeblogs.java | 2 +- 5 files changed, 12 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a07711..4682fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,3 @@ -# Changes in version 1.10.0 - 2019-0?-?? - - * Medium changes - * Update build-time and run-time dependencies to versions found in - Debian buster, including: commons-codec-1.11.jar, - commons-compress-1.18.jar, jackson-annotations-2.9.8.jar, - jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar, - logback-core-1.2.3.jar, logback-classic-1.2.3.jar, - slf4j-api-1.7.25.jar, and xz-1.8.jar. - * Update Checkstyle dependencies to versions found in Debian - buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar, - checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, - commons-collections3-3.2.2.jar, commons-logging-1.2.jar, - guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. - * Update Cobertura dependencies to versions found in Debian buster, - including: asm4-5.0.4.jar, asm4-util-5.0.4.jar, - asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar, - asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar - - # Changes in version 1.9.1 - 2019-05-29 * Medium changes diff --git a/build.xml b/build.xml index d35fd58..d0fd248 100644 --- a/build.xml +++ b/build.xml @@ -15,16 +15,16 @@ <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" > - <include name="commons-codec-1.11.jar"/> - <include name="commons-compress-1.18.jar"/> - <include name="jackson-annotations-2.9.8.jar"/> - <include name="jackson-core-2.9.8.jar"/> - <include name="jackson-databind-2.9.8.jar"/> - <include name="xz-1.8.jar"/> + <include name="commons-codec-1.10.jar"/> + <include name="commons-compress-1.13.jar"/> + <include name="jackson-annotations-2.8.6.jar"/> + <include name="jackson-core-2.8.6.jar"/> + <include name="jackson-databind-2.8.6.jar"/> + <include name="xz-1.6.jar"/> <include name="metrics-lib-${metricslibversion}-thin.jar"/> - <include name="logback-core-1.2.3.jar" /> - <include name="logback-classic-1.2.3.jar" /> - <include name="slf4j-api-1.7.25.jar" /> + <include name="logback-core-1.1.9.jar" /> + <include name="logback-classic-1.1.9.jar" /> + <include name="slf4j-api-1.7.22.jar" /> </patternset> <target name="coverage-check"> diff --git a/src/build b/src/build index 42ee1fc..ed48192 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 42ee1fc086b0e86cddf56475124a547465484321 +Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java index 32e20ce..ba4bcd9 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -72,9 +72,7 @@ public enum Key { private static Set<String> keys; /** - * Instantiate a new {@code Key} using the given class for the key value. - * - * @param clazz Class of key value. + * @param Class of key value. */ Key(Class clazz) { this.clazz = clazz; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index 539194e..027cfde 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -166,7 +166,7 @@ public class SanitizeWeblogs extends CollecTorMain { private static final int BATCH = 100_000; static byte[] toCompressedBytes(Map<String, Long> lines) - throws DescriptorParseException { + throws DescriptorParseException { try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); OutputStream os = FileType.XZ.outputStream(baos)) { for (Map.Entry<String, Long> entry : lines.entrySet()) {

1 0