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

[translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 28 Aug '18

28 Aug '18

commit 0bd7dbd2312745ed7750b5a811804df2c6ebd488 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 28 12:18:16 2018 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- es_AR/abouttbupdate.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/es_AR/abouttbupdate.dtd b/es_AR/abouttbupdate.dtd index fa6ba24d7..64939e7c4 100644 --- a/es_AR/abouttbupdate.dtd +++ b/es_AR/abouttbupdate.dtd @@ -4,3 +4,7 @@ <!ENTITY aboutTBUpdate.linkLabel "visita nuestro sitio web"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Bitácora de cambios:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nueva visualización de Circuito, rediseñada"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡La visualización del Circuito Tor ha sido reubicada y mejorada! Cliquear el botón Identidad de Sitio (localizado en el lado izquierdo de la barra URL) para ver la nueva visualización de circuito."> +<!ENTITY aboutTBUpdate.learnMore "Aprendé más">

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 28 Aug '18

28 Aug '18

commit 364157749cfd2240894c5e13ecacddfb24be8810 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 28 12:18:11 2018 +0000 Update translations for torbutton-abouttbupdatedtd --- es_AR/abouttbupdate.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/abouttbupdate.dtd b/es_AR/abouttbupdate.dtd index fa476eca3..64939e7c4 100644 --- a/es_AR/abouttbupdate.dtd +++ b/es_AR/abouttbupdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Bitácora de cambios:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nueva visualización de Circuito, rediseñada"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡La visualización del Circuito Tor ha sido reubicada y mejorada! Cliquear el botón Identidad de Sitio (localizado en el lado izquierdo de la barra URL) para ver la nueva visualización de circuito."> +<!ENTITY aboutTBUpdate.learnMore "Aprendé más">

1 0

[translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
by translation＠torproject.org 28 Aug '18

28 Aug '18

commit 640739083dcd5c7e38416624d57996f28242085d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 28 12:16:45 2018 +0000 Update translations for tba-android_stringsdtd --- es_AR/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/android_strings.dtd b/es_AR/android_strings.dtd index 9596d5307..b0a907901 100644 --- a/es_AR/android_strings.dtd +++ b/es_AR/android_strings.dtd @@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site is run by " --> <!ENTITY doorhanger_tracking_message_disabled2 "This page includes elements that may track your browsing.">  -<!ENTITY learn_more "Learn More"> +<!ENTITY learn_more "Aprendé más"> <!ENTITY enable_protection "Enable protection"> <!ENTITY disable_protection "Disable protection">

1 0

[exonerator/release] Remove redundant initializers.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 7c318d3400c1e73b92323e42a985f270f3a4bf2f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:29:01 2018 +0200 Remove redundant initializers. --- .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index ab4f094..00a3d89 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -71,7 +71,7 @@ public class ExoneraTorDatabaseImporter { logger.error("Could not find config file. Exiting."); System.exit(1); } - String line = null; + String line; try { BufferedReader br = new BufferedReader(new FileReader(configFile)); while ((line = br.readLine()) != null) { @@ -177,7 +177,7 @@ public class ExoneraTorDatabaseImporter { try { BufferedReader br = new BufferedReader(new FileReader( parseHistoryFile)); - String line = null; + String line; int lineNumber = 0; while ((line = br.readLine()) != null) { lineNumber++;

1 0

[exonerator/release] Make a couple JavaDoc fixes.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit a1270a1865b9cf2e84e8bc754358a2f689b80d61 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 09:52:36 2018 +0200 Make a couple JavaDoc fixes. --- .../torproject/metrics/exonerator/ExoneraTorServlet.java | 4 ++-- .../org/torproject/metrics/exonerator/QueryResponse.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 8786261..bd593cc 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -239,8 +239,8 @@ public class ExoneraTorServlet extends HttpServlet { /* Helper methods for handling the request. */ - /** Parse an IP parameter and return either a non-<code>null</code> value in - * case the parameter was valid or empty, or <code>null</code> if it was + /** Parse an IP parameter and return either a non-{@code null} value in + * case the parameter was valid or empty, or {@code null} if it was * non-empty and invalid. */ static String parseIpParameter(String passedIpParameter) { String relayIp = null; diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index 6a77565..b40b65f 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -37,25 +37,25 @@ public class QueryResponse { /** Version of this response format. */ String version = VERSION; - /** Query IP address passed in the request; never <code>null</code>. */ + /** Query IP address passed in the request; never {@code null}. */ String queryAddress; - /** Query date passed in the request; never <code>null</code>. */ + /** Query date passed in the request; never {@code null}. */ String queryDate; /** ISO-formatted valid-after time of the first status contained in the - * database; only <code>null</code> if the database is empty. */ + * database; only {@code null} if the database is empty. */ String firstDateInDatabase; /** ISO-formatted valid-after time of the last status contained in the - * database; only <code>null</code> if the database is empty. */ + * database; only {@code null} if the database is empty. */ String lastDateInDatabase; /** Whether there is at least one relevant status in the database on or within - * a day of the requested date; <code>null</code> if the database is empty. */ + * a day of the requested date; {@code null} if the database is empty. */ Boolean relevantStatuses; - /** All matches for the given IP address and date; <code>null</code> if there + /** All matches for the given IP address and date; {@code null} if there * were no matches at all. */ Match[] matches; @@ -123,7 +123,7 @@ public class QueryResponse { /** Relay nickname. */ String nickname; - /** Whether this relay permitted exiting or not; <code>null</code> if + /** Whether this relay permitted exiting or not; {@code null} if * unknown. */ Boolean exit; @@ -141,7 +141,7 @@ public class QueryResponse { } } - /** All known IP addresses in the same /24 or /48 network; <code>null</code> + /** All known IP addresses in the same /24 or /48 network; {@code null} * if there were direct matches for the given IP address. */ String[] nearbyAddresses; }

1 0

[exonerator/release] Inline redundant local variables.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit dc87c84ca3d97c67f7d290f2299db83eb0766a69 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 14:10:14 2018 +0200 Inline redundant local variables. --- src/main/java/org/torproject/metrics/exonerator/QueryServlet.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index 556d8d3..d597b4e 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -175,8 +175,7 @@ public class QueryServlet extends HttpServlet { for (int i = 0; i < address24Bytes.length; i++) { address24Bytes[i] = (byte) Integer.parseInt(relayIpParts[i]); } - String address24 = Hex.encodeHexString(address24Bytes); - return address24; + return Hex.encodeHexString(address24Bytes); } private String convertIpV6ToHex(String relayIp) {

1 0

[exonerator/release] Fix links to IP addresses in same /24.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit b8dbfe1ac93e6e0594efa6b89b390681cd37cb6b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 27 15:39:29 2018 +0200 Fix links to IP addresses in same /24. Fixes #27266. --- CHANGELOG.md | 6 ++++++ .../torproject/metrics/exonerator/ExoneraTorServlet.java | 14 +++++++------- .../metrics/exonerator/ExoneraTorServletTest.java | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dce2f3a..44a3631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 3.0.1 - 2018-08-?? + + * Medium changes + - Fix links to IP addresses in same /24. + + # Changes in version 3.0.0 - 2018-08-13 * Major changes diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index bd593cc..5909f26 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -215,7 +215,7 @@ public class ExoneraTorServlet extends HttpServlet { statusEntries); } else if (addressesInSameNetwork != null && !addressesInSameNetwork.isEmpty()) { - this.writeSummaryAddressesInSameNetwork(out, rb, relayIp, + this.writeSummaryAddressesInSameNetwork(out, rb, requestUrl, relayIp, requestedDate.asString, langStr, addressesInSameNetwork); } else { this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString); @@ -464,8 +464,8 @@ public class ExoneraTorServlet extends HttpServlet { } void writeSummaryAddressesInSameNetwork(PrintWriter out, - ResourceBundle rb, String relayIp, String timestampStr, String langStr, - List<String> addressesInSameNetwork) { + ResourceBundle rb, String requestUrl, String relayIp, String timestampStr, + String langStr, List<String> addressesInSameNetwork) { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; for (int i = 0; i < addressesInSameNetwork.size(); i++) { String addressInSameNetwork = addressesInSameNetwork.get(i); @@ -473,12 +473,12 @@ public class ExoneraTorServlet extends HttpServlet { String address; if (addressInSameNetwork.contains(":")) { address = addressInSameNetwork.replaceAll("[\\[\\]]", ""); - link = String.format("/?ip=[%s]&timestamp=%s&lang=%s", - address.replaceAll(":", "%3A"), timestampStr, langStr); + link = String.format("%s?ip=[%s]&timestamp=%s&lang=%s", + requestUrl, address.replaceAll(":", "%3A"), timestampStr, langStr); address = "[" + address + "]"; } else { - link = String.format("/?ip=%s&timestamp=%s&lang=%s", - addressInSameNetwork, timestampStr, langStr); + link = String.format("%s?ip=%s&timestamp=%s&lang=%s", + requestUrl, addressInSameNetwork, timestampStr, langStr); address = addressInSameNetwork; } panelItems[i] = new Object[] { link, address }; diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 34dfd42..1ede590 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java @@ -49,7 +49,7 @@ public class ExoneraTorServletTest { for (QueryResponse qr : qrs) { StringWriter sw = new StringWriter(); es.writeSummaryAddressesInSameNetwork(new PrintWriter(sw), rb, - qr.queryAddress, qr.queryDate, "en", + "http://localhost:8080/", qr.queryAddress, qr.queryDate, "en", Arrays.asList(qr.nearbyAddresses)); String errorMsg = "Test data:" + QueryResponse.toJson(qr) + "\nresult:\n" + sw.toString();

1 0

[exonerator/release] Fix two Checkstyle issues.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit f1654b3e818be9c9531b8e57dea6263a8997adaf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 28 09:07:58 2018 +0200 Fix two Checkstyle issues. --- .../java/org/torproject/metrics/exonerator/QueryResponse.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index b40b65f..e920ecf 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -37,10 +37,14 @@ public class QueryResponse { /** Version of this response format. */ String version = VERSION; - /** Query IP address passed in the request; never {@code null}. */ + /** + * Query IP address passed in the request; never {@code null}. + */ String queryAddress; - /** Query date passed in the request; never {@code null}. */ + /** + * Query date passed in the request; never {@code null}. + */ String queryDate; /** ISO-formatted valid-after time of the first status contained in the

1 0

[exonerator/release] Prepare for 3.0.1 release.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 6ae8035f4f60f516d1d40c22ad753516c3cd3c16 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 28 09:08:38 2018 +0200 Prepare for 3.0.1 release. --- CERT | 18 +++++++++--------- CHANGELOG.md | 6 +++++- build.xml | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CERT b/CERT index 61fa7c6..b90b397 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIENNGkczANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIELle0dTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw -NTIzMTUxNDU2WhcNMTgwODIxMTUxNDU2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +ODI4MDcwNjM2WhcNMTgxMTI2MDcwNjM2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAJtEQ -B2AVpVtjTGU7uujUtEjSn1ICv7QLW/37TmHn+m1SWvXOVlSG81eb5JwX449Pn3w5 -K1Bx0JJmJ6Kec2kHtoR1r5/DUlTMtRqKQ5ZHQbvYMx+Ifq8TRALHjcw8p5Vw+gep -0zYbSQycklzFaFqLB8Cus0ICb+UY54HTddpezQ3IXS/vc4Vy07ocm8rUCz1s8L/r -ehTOxSym7G7+kcRzNplFOLL5iO8o6uHPyLR1TIAIXa0XZ41ogNl2q+6CvXG+UI/j -qkzSXD6FJK1Px2nxNFIe/w9NL+chSytIGnV3CImyiORuV+1OxMglyQspSGEbl1XP -OfiTEYHnp12BYMeRyw== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAkXZs +3T3GTkZ+EGvZG5puzKdgZiSsLgIy25xdWsIx147AIZEJFKjEAtbu0osMpkTa96B6 +a+BHf7PTjQUuH3YOEmeW9ab8pwu5SRijCq2qkuvjjSLBcJzWnalcKDYYvoQte1// +Di8JqpRXCw20WY2bldTiafyG80E0RGfiX2I8vbDiPIhjwz9Wox8Q1rw1c9T/vRn9 +pI8FrHgTnDO6R54yD25QSpsj+hC+IDkFKO17vGCIaJrPG5o6th438ijEwJsG+LRB +4zKKKsFTby7UJI3Ag8xolIhsBkRZO2j4Na35i15SZ7QJNj9J5g171z8RyOmyIQbg +q7OXN2iiRIxiIJwoQw== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index 44a3631..0387338 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ -# Changes in version 3.0.1 - 2018-08-?? +# Changes in version 3.0.1 - 2018-08-28 * Medium changes - Fix links to IP addresses in same /24. + * Minor changes + - Make several improvements to the code, none of which should + affect operation. + # Changes in version 3.0.0 - 2018-08-13 diff --git a/build.xml b/build.xml index eaa2a94..6dc86d9 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="3.0.0-dev" /> + <property name="release.version" value="3.0.1" /> <property name="metricslibversion" value="2.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[exonerator/release] Bump version to 3.0.0-dev.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 33798614b10574bbd2059ac49c5e6136a912d0d0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 14 20:32:46 2018 +0200 Bump version to 3.0.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9d68d0e..eaa2a94 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="3.0.0" /> + <property name="release.version" value="3.0.0-dev" /> <property name="metricslibversion" value="2.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0