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

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Oct '17

16 Oct '17

commit 583c1c763d3338f8e29d9dc946be6f5c806744f5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 16 10:46:06 2017 +0000 Update translations for tails-persistence-setup --- bn/bn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn/bn.po b/bn/bn.po index ee2893a74..f5a1f4f38 100644 --- a/bn/bn.po +++ b/bn/bn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-10-02 15:08+0000\n" +"PO-Revision-Date: 2017-10-16 10:43+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n" "MIME-Version: 1.0\n"

1 0

[exonerator/master] Update change log to include recent changes.
by karsten＠torproject.org 16 Oct '17

16 Oct '17

commit 8352ccd4cd555fd8ba3fb83247fa4eebb017c300 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 16 12:06:25 2017 +0200 Update change log to include recent changes. --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcee5d..1c4ecf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Changes in version 1.0.2 - 2017-10-16 + + * Major changes + - Fix NullPointerException caused by invalid parameters. + + * Minor changes + - Resolve checkstyle warnings from more recent guidelines. + - Update from Apache Commons Lang 2 to 3. + + # Changes in version 1.0.1 - 2017-09-16 * Medium changes

1 0

[exonerator/master] Fix NPE caused by invalid parameters.
by karsten＠torproject.org 16 Oct '17

16 Oct '17

commit e1e20c06c99f76ae26316410ce5b5f86063b0296 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 16 12:00:34 2017 +0200 Fix NPE caused by invalid parameters. Turns out we shouldn't attempt to write a permanent link containing an invalid parameter. In this case we wouldn't even write this permanent link, because we'd have closed the output stream before. But we still ran into the exception while trying. Reported by ln5, analyzed by iwakeh. Resolves #23488. --- .../torproject/exonerator/ExoneraTorServlet.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index cba4420..13d5596 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -193,22 +193,22 @@ public class ExoneraTorServlet extends HttpServlet { this.writeFooter(out, rb, relayIp, timestampStr); /* Print out result. */ - } else if (!statusEntries.isEmpty()) { - this.writeSummaryPositive(out, rb, relayIp, timestampStr); - this.writeTechnicalDetails(out, rb, relayIp, timestampStr, - statusEntries); - } else if (addressesInSameNetwork != null - && !addressesInSameNetwork.isEmpty()) { - this.writeSummaryAddressesInSameNetwork(out, rb, relayIp, - timestampStr, langStr, addressesInSameNetwork); } else { - this.writeSummaryNegative(out, rb, relayIp, timestampStr); + if (!statusEntries.isEmpty()) { + this.writeSummaryPositive(out, rb, relayIp, timestampStr); + this.writeTechnicalDetails(out, rb, relayIp, timestampStr, + statusEntries); + } else if (addressesInSameNetwork != null + && !addressesInSameNetwork.isEmpty()) { + this.writeSummaryAddressesInSameNetwork(out, rb, relayIp, + timestampStr, langStr, addressesInSameNetwork); + } else { + this.writeSummaryNegative(out, rb, relayIp, timestampStr); + } + this.writePermanentLink(out, rb, relayIp, timestampStr, langStr); + this.writeFooter(out, rb, relayIp, timestampStr); } - this.writePermanentLink(out, rb, relayIp, timestampStr, langStr); - - this.writeFooter(out, rb, relayIp, timestampStr); - /* Forward to the JSP that adds header and footer. */ request.setAttribute("lang", langStr); request.setAttribute("body", so.toString());

1 0

[exonerator/master] Use modern commons lib lang3 instead of legacy version (lang-2).
by karsten＠torproject.org 16 Oct '17

16 Oct '17

commit 351212da2439503b1d792a44966325410da4d8f6 Author: iwakeh <iwakeh(a)torproject.org> Date: Sat Sep 16 15:13:29 2017 +0000 Use modern commons lib lang3 instead of legacy version (lang-2). --- build.xml | 2 +- src/main/java/org/torproject/exonerator/ExoneraTorServlet.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index a63f4eb..66d78eb 100644 --- a/build.xml +++ b/build.xml @@ -20,7 +20,7 @@ <include name="metrics-lib-${metricslibversion}.jar"/> <include name="commons-compress-1.13.jar"/> <include name="commons-codec-1.10.jar"/> - <include name="commons-lang-2.6.jar"/> + <include name="commons-lang3-3.5.jar"/> <include name="gson-2.4.jar" /> <include name="postgresql-9.4.1212.jar"/> <include name="servlet-api-3.0.jar"/> diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index 1e1bc42..cba4420 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -3,7 +3,7 @@ package org.torproject.exonerator; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -424,8 +424,8 @@ public class ExoneraTorServlet extends HttpServlet { private void writeSummaryInvalidIp(PrintWriter out, ResourceBundle rb, String ipParameter) throws IOException { String escapedIpParameter = ipParameter.length() > 40 - ? StringEscapeUtils.escapeHtml(ipParameter.substring(0, 40)) - + "[...]" : StringEscapeUtils.escapeHtml(ipParameter); + ? StringEscapeUtils.escapeHtml4(ipParameter.substring(0, 40)) + + "[...]" : StringEscapeUtils.escapeHtml4(ipParameter); this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", rb.getString("summary.invalidparams.invalidip.title"), null, @@ -436,9 +436,9 @@ public class ExoneraTorServlet extends HttpServlet { private void writeSummaryInvalidTimestamp(PrintWriter out, ResourceBundle rb, String timestampParameter) throws IOException { String escapedTimestampParameter = timestampParameter.length() > 20 - ? StringEscapeUtils.escapeHtml(timestampParameter + ? StringEscapeUtils.escapeHtml4(timestampParameter .substring(0, 20)) + "[...]" - : StringEscapeUtils.escapeHtml(timestampParameter); + : StringEscapeUtils.escapeHtml4(timestampParameter); this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", rb.getString("summary.invalidparams.invalidtimestamp.title"),

1 0

[exonerator/master] Remove recently introduced checkstyle problems.
by karsten＠torproject.org 16 Oct '17

16 Oct '17

commit acd4225c29d74b4348263036854871f0c2873b7b Author: iwakeh <iwakeh(a)torproject.org> Date: Sat Sep 16 15:13:28 2017 +0000 Remove recently introduced checkstyle problems. --- .../java/org/torproject/exonerator/ExoneraTorServlet.java | 2 -- src/main/java/org/torproject/exonerator/QueryResponse.java | 4 +--- .../org/torproject/exonerator/ExoneraTorServletTest.java | 3 --- .../java/org/torproject/exonerator/QueryResponseTest.java | 14 ++++++++------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index e5dac24..1e1bc42 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -9,11 +9,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; import java.io.StringWriter; -import java.net.MalformedURLException; import java.net.URL; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/org/torproject/exonerator/QueryResponse.java b/src/main/java/org/torproject/exonerator/QueryResponse.java index b172b7d..448676d 100644 --- a/src/main/java/org/torproject/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/exonerator/QueryResponse.java @@ -10,9 +10,7 @@ import com.google.gson.annotations.SerializedName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.io.Reader; -import java.util.Objects; /** Query response from the ExoneraTor database. */ public class QueryResponse { @@ -92,7 +90,7 @@ public class QueryResponse { } /** Return QueryResponse parsed from the given input stream, or - * <code>null</code> if something fails or an unrecognized version is found. */ + * {@code null} if something fails or an unrecognized version is found. */ public static QueryResponse fromJson(Reader reader) { Gson gson = new Gson(); try { diff --git a/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java index b2e3ed4..49d9470 100644 --- a/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java @@ -7,9 +7,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import java.util.Arrays; -import java.util.Collection; - public class ExoneraTorServletTest { private static final String[][] ipTestData diff --git a/src/test/java/org/torproject/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/exonerator/QueryResponseTest.java index 8c79949..634cdf5 100644 --- a/src/test/java/org/torproject/exonerator/QueryResponseTest.java +++ b/src/test/java/org/torproject/exonerator/QueryResponseTest.java @@ -5,7 +5,6 @@ package org.torproject.exonerator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,7 +28,8 @@ public class QueryResponseTest { + "\"query_date\":\"2016-12-12\"," + "\"first_date_in_database\":\"2016-01-01\"," + "\"last_date_in_database\":\"2016-12-31\"," - + "\"relevant_statuses\":true,\"matches\":[{\"timestamp\":\"2016-12-03\"," + + "\"relevant_statuses\":true," + + "\"matches\":[{\"timestamp\":\"2016-12-03\"," + "\"addresses\":[\"12.13.14.15\"," + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," + "\"nickname\":\"some name\"," @@ -56,7 +56,8 @@ public class QueryResponseTest { + "\"query_date\":\"2016-12-12\"," + "\"first_date_in_database\":\"2016-01-01\"," + "\"last_date_in_database\":\"2016-12-31\"," - + "\"relevant_statuses\":true,\"matches\":[{\"timestamp\":\"2016-12-03\"," + + "\"relevant_statuses\":true," + + "\"matches\":[{\"timestamp\":\"2016-12-03\"," + "\"addresses\":[\"12.13.14.15\"," + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," + "\"nickname\":\"some name\"," @@ -80,7 +81,8 @@ public class QueryResponseTest { + "\"query_date\":\"2016-12-12\"," + "\"first_date_in_database\":\"2016-01-01\"," + "\"last_date_in_database\":\"2016-12-31\"," - + "\"relevant_statuses\":false,\"matches\":[{\"timestamp\":\"2016-12-03\"," + + "\"relevant_statuses\":false," + + "\"matches\":[{\"timestamp\":\"2016-12-03\"," + "\"addresses\":[\"12.13.14.15\"," + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," + "\"nickname\":\"some name\"},{\"timestamp\":\"2012-12-03\"," @@ -105,8 +107,8 @@ public class QueryResponseTest { if (null == this.queryResponse) { assertNull(QueryResponse.fromJson(new StringReader(this.json))); } else { - assertEquals(json, - QueryResponse.toJson(QueryResponse.fromJson(new StringReader(this.json)))); + assertEquals(json, QueryResponse + .toJson(QueryResponse.fromJson(new StringReader(this.json)))); } }

1 0

[tor/master] Describe what router_reset_descriptor_download_failures() actually does
by nickm＠torproject.org 16 Oct '17

16 Oct '17

commit eaf9c0f25a3aeb8f7a8325e99615442853dcb224 Author: teor <teor2345(a)gmail.com> Date: Tue Oct 10 14:36:08 2017 -0400 Describe what router_reset_descriptor_download_failures() actually does Comment-only change. Part of #23813. --- src/or/routerlist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c7c109253..1fa27f722 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5358,8 +5358,10 @@ update_extrainfo_downloads(time_t now) smartlist_free(wanted); } -/** Reset the descriptor download failure count on all routers, so that we - * can retry any long-failed routers immediately. +/** Reset the consensus and extra-info download failure count on all routers. + * When we get a new consensus, + * routers_update_status_from_consensus_networkstatus() will reset the + * download statuses on the descriptors in that consensus. */ void router_reset_descriptor_download_failures(void) @@ -5371,6 +5373,8 @@ router_reset_descriptor_download_failures(void) last_descriptor_download_attempted = 0; if (!routerlist) return; + /* We want to download *all* extra-info descriptors, not just those in + * the consensus we currently have (or are about to have) */ SMARTLIST_FOREACH(routerlist->routers, routerinfo_t *, ri, { download_status_reset(&ri->cache_info.ei_dl_status);

1 0

[tor/master] Merge branch 'teor_bug23813_squashed'
by nickm＠torproject.org 16 Oct '17

16 Oct '17

commit d8604b8729b24f964d78d188b89493098d3eb92b Merge: e00f12ec6 eaf9c0f25 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 15 20:36:23 2017 -0400 Merge branch 'teor_bug23813_squashed' src/or/routerlist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 87f60e1f896cec9399015191ebb48c6300d59ff5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 22:53:49 2017 +0000 Update translations for tor-browser-manual --- pa/pa.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pa/pa.po b/pa/pa.po index 8be91990d..e0d418177 100644 --- a/pa/pa.po +++ b/pa/pa.po @@ -1,11 +1,11 @@ # Translators: -# A S Alam <apreet.alam(a)gmail.com>, 2016 +# A S Alam <alam.yellow(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: A S Alam <apreet.alam(a)gmail.com>, 2016\n" +"Last-Translator: A S Alam <alam.yellow(a)gmail.com>, 2016\n" "Language-Team: Panjabi (Punjabi) (https://www.transifex.com/otf/teams/1519/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 019663557824c5b24780430817521f63511e2475 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 22:51:39 2017 +0000 Update translations for tails-greeter-2 --- pa/pa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pa/pa.po b/pa/pa.po index ab8721346..30aae1141 100644 --- a/pa/pa.po +++ b/pa/pa.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-15 21:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: A S Alam <apreet.alam(a)gmail.com>, 2016\n" +"Last-Translator: A S Alam <alam.yellow(a)gmail.com>, 2016\n" "Language-Team: Panjabi (Punjabi) (https://www.transifex.com/otf/teams/1519/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] bump version on master to 0.3.3.0-alpha-dev
by nickm＠torproject.org 15 Oct '17

15 Oct '17

commit e00f12ec6c6fda091bbf09d0bfeab057947d3808 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 15 11:57:06 2017 -0400 bump version on master to 0.3.3.0-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 668fd4f1f..c02646426 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.2-alpha-dev]) +AC_INIT([tor],[0.3.3.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 02d4ef907..f3c23ef33 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.2.2-alpha-dev" +!define VERSION "0.3.3.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 6c3000a71..5e3c5d87f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.2.2-alpha-dev" +#define VERSION "0.3.3.0-alpha-dev"

1 0