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

[metrics-lib/master] Properly parse hostname in v2 network status.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit ca37fd616c1e6464829e4ef64d6252944ccb69f5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 17:53:54 2019 +0100 Properly parse hostname in v2 network status. --- CHANGELOG.md | 2 ++ .../java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 1 + .../java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 568f115..ad91d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Fix a NullPointerException when parsing an invalid crypto block starting with "-----END " rather than "-----BEGIN ". + - Properly parse an authority's hostname from the "dir-source" line + in a v2 network status. # Changes in version 2.9.1 - 2019-11-09 diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 1af9503..9860df0 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -181,6 +181,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl throw new DescriptorParseException("Illegal hostname in '" + line + "'."); } + this.hostname = parts[1]; this.address = ParseHelper.parseIpv4Address(line, parts[2]); this.dirPort = ParseHelper.parsePort(line, parts[3]); } diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java index 9ecf391..80d46da 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java @@ -60,6 +60,7 @@ public class RelayNetworkStatusImplTest { new int[] { 0, statusBytes.length }, null); assertEquals(rnsi.getContactLine(), "1024R/8D56913D Alex de Joode <adejoode(a)sabotage.org>"); + assertEquals("194.109.206.212", rnsi.getHostname()); } }

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit 83bbf89973ebc396738dbcb64ff77084492aa245 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 16:51:21 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 349aa2432..46ccb2a7e 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -529,6 +529,8 @@ msgid "" "6. Alternatively, from inside the Tor Browser directory, you can also start " "from the command line by running:" msgstr "" +"6. Como alternativa, a inicialização pode ser feita a partir do diretório do" +" Navegador Tor, executando-se o comando:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -551,6 +553,8 @@ msgid "" "When you run Tor Browser for the first time, you will see the Tor Network " "Settings window." msgstr "" +"Ao rodar o Navegador Tor pela primeira vez, você verá a janela de " +"Configurações da Rede Tor." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -558,6 +562,8 @@ msgid "" "This offers you the option to connect directly to the Tor network, or to " "configure Tor Browser for your connection." msgstr "" +"Isso te oferecerá a opção de conectar-se diretamente à rede Tor, ou " +"configurar o Navegador Tor de acordo com a sua conexão." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -591,6 +597,9 @@ msgid "" "at a certain point, see the [Troubleshooting](/troubleshooting) page for " "help solving the problem." msgstr "" +"Se você estiver utilizando uma conexão relativamente rápida, mas a barra " +"pausar em dado momento, consulte a página de [Solução de " +"problemas](/troubleshooting/) para obter ajuda." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -671,6 +680,8 @@ msgid "" "Direct access to the Tor network may sometimes be blocked by your Internet " "Service Provider or by a government." msgstr "" +"O acesso direto à rede Tor às vezes pode estar sendo bloqueado pelo seu " +"provedor de Internet, ou pelo governo." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[torspec/master] prop304: Close proposal now merged into our main specs
by asn＠torproject.org 20 Nov '19

20 Nov '19

commit 7c222131ba32bc22d3f34baa13eecaa6e8bd7546 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 20 09:36:39 2019 -0500 prop304: Close proposal now merged into our main specs Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/000-index.txt | 4 ++-- proposals/304-socks5-extending-hs-error-codes.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 6e7b802..44de59f 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -224,7 +224,7 @@ Proposals by number: 301 Don't include package fingerprints in consensus documents [ACCEPTED] 302 Hiding onion service clients using padding [CLOSED] 303 When and how to remove support for protocol versions [DRAFT] -304 Extending SOCKS5 Onion Service Error Codes [ACCEPTED] +304 Extending SOCKS5 Onion Service Error Codes [CLOSED] 305 ESTABLISH_INTRO Cell DoS Defense Extension [DRAFT] 306 A Tor Implementation of IPv6 Happy Eyeballs [OPEN] 307 Onion Balance Support for Onion Service v3 [DRAFT] @@ -275,7 +275,6 @@ Proposals by status: 288 Privacy-Preserving Statistics with Privcount in Tor (Shamir version) 292 Mesh-based vanguards 301 Don't include package fingerprints in consensus documents - 304 Extending SOCKS5 Onion Service Error Codes META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -378,6 +377,7 @@ Proposals by status: 297 Relaxing the protover-based shutdown rules [for 0.3.5.x] [in 0.4.0.x] 298 Putting family lines in canonical form [for 0.3.6.x] [in 0.4.0.1-alpha] 302 Hiding onion service clients using padding [in 0.4.1.1-alpha] + 304 Extending SOCKS5 Onion Service Error Codes SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/304-socks5-extending-hs-error-codes.txt b/proposals/304-socks5-extending-hs-error-codes.txt index 56a3487..d8ff7d5 100644 --- a/proposals/304-socks5-extending-hs-error-codes.txt +++ b/proposals/304-socks5-extending-hs-error-codes.txt @@ -2,7 +2,7 @@ Filename: 304-socks5-extending-hs-error-codes.txt Title: Extending SOCKS5 Onion Service Error Codes Author: David Goulet, George Kadianakis Created: 22-May-2019 -Status: Accepted +Status: Closed Note: We are extending SOCKS5 here but in terms, when Tor Browser supports HTTPCONNECT, we should not do that anymore.

1 0

[torspec/master] socks-extensions.txt: Merge in prop304
by asn＠torproject.org 20 Nov '19

20 Nov '19

commit c5bca880894f216c42635b5f1982d057d7cf4778 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 20 09:35:52 2019 -0500 socks-extensions.txt: Merge in prop304 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- socks-extensions.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/socks-extensions.txt b/socks-extensions.txt index ed249ad..e2fe5da 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -42,6 +42,10 @@ Tor's extensions to the SOCKS protocol username/password fields of this message to be empty. This technically violates RFC1929 [4], but ensures interoperability with somewhat broken SOCKS5 client implementations. + - Custom reply error code. The "REP" fields, as per the RFC[3], has + unassigned values which are used to describe Tor internal errors. See + ExtendedErrors in the tor.1 man page for more details. It is only sent + back if this SocksPort flag is set. (For more information on stream isolation, see IsolateSOCKSAuth on the Tor manpage.)

1 0

[metrics-web/master] Remove unnecessary casts.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit c44822c1f10c0f92ec6ef8e77fcb88f29e96d548 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 16:38:53 2019 +0100 Remove unnecessary casts. --- src/main/java/org/torproject/metrics/stats/advbwdist/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Parser.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java | 2 +- src/test/java/org/torproject/metrics/web/DirectoryListingTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java index d6bf4db..da335ce 100644 --- a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java @@ -205,7 +205,7 @@ public class Main { computedPercentiles.put(p, minValue); } else { computedPercentiles.put(p, - (long) Math.floor(percentile.evaluate((double) p))); + (long) Math.floor(percentile.evaluate(p))); } } return computedPercentiles; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java index 558ce39..57a0d5f 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java @@ -147,7 +147,7 @@ public class Parser { * file, followed by its absolute path. */ String absolutePath = e.getKey(); long lastModifiedMillis = e.getValue(); - bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath + bw.write(lastModifiedMillis + " " + absolutePath + "\n"); } } catch (IOException e) { diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java index 445d931..f5e1b85 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java @@ -271,7 +271,7 @@ public class Simulate { for (Map.Entry<Double, SortedSet<Integer>> e : storedDescs.entrySet()) { double fingerprint = e.getKey(); - long observed = (long) e.getValue().size(); + long observed = e.getValue().size(); long afterBinning = ((observed + binSize - 1L) / binSize) * binSize; double randomDouble = rnd.nextDouble(); double laplaceNoise = -b * (randomDouble > 0.5 ? 1.0 : -1.0) diff --git a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java index 3bd354f..a74df81 100644 --- a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java +++ b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java @@ -54,7 +54,7 @@ public class DirectoryListingTest { assertEquals(4, dl.size()); for (String key : new String[]{"/collector/a1/", "/collector/", "/collector/a1/p2/", "/collector/a1/p1/"}) { - assertTrue("Missing: " + key, dl.keySet().contains(key)); + assertTrue("Missing: " + key, dl.containsKey(key)); } assertEquals("[Parent Directory, /collector.html, , ]", Arrays.toString(dl.get("/collector/").get(0)));

1 0

[metrics-web/master] Replace several <code>...</code> with {@code}.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 603a64bd1afecae4aa3d94df5351329de0dcf5c8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:13:30 2019 +0100 Replace several <code>...</code> with {@code}. --- .../org/torproject/metrics/stats/advbwdist/Main.java | 2 +- .../stats/bwhist/RelayDescriptorDatabaseImporter.java | 18 +++++++++--------- .../org/torproject/metrics/stats/clients/Database.java | 8 ++++---- .../org/torproject/metrics/stats/onionperf/Main.java | 14 +++++++------- .../org/torproject/metrics/stats/servers/Database.java | 8 ++++---- .../torproject/metrics/stats/totalcw/OutputLine.java | 2 +- .../org/torproject/metrics/stats/totalcw/Parser.java | 4 ++-- .../stats/totalcw/TotalcwRelayNetworkStatus.java | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java index 3afcb80..d6bf4db 100644 --- a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java @@ -211,7 +211,7 @@ public class Main { return computedPercentiles; } - /** Return the median for the given list of values, or <code>Double.NaN</code> + /** Return the median for the given list of values, or {@code Double.NaN} * if the given list is empty. */ static double computeMedian(List<Long> valueList) { Median median = new Median() diff --git a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java index 9f9ecff..457517f 100644 --- a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java @@ -645,11 +645,11 @@ public final class RelayDescriptorDatabaseImporter { return statistics; } - /** Retrieve the <code>boolean</code> value of the designated column in the - * current row of the given <code>ResultSet</code> object and format it as a - * <code>String</code> object with <code>"t"</code> for <code>true</code> and - * <code>"f"</code> for <code>false</code>, or return <code>null</code> if the - * retrieved value was <code>NULL</code>. */ + /** Retrieve the {@code boolean} value of the designated column in the + * current row of the given {@code ResultSet} object and format it as a + * {@code String} object with {@code "t"} for {@code true} and + * {@code "f"} for {@code false}, or return {@code null} if the + * retrieved value was {@code NULL}. */ private static String getBooleanFromResultSet(ResultSet rs, String columnLabel) throws SQLException { boolean result = rs.getBoolean(columnLabel); @@ -660,10 +660,10 @@ public final class RelayDescriptorDatabaseImporter { } } - /** Retrieve the <code>long</code> value of the designated column in the - * current row of the given <code>ResultSet</code> object and format it as a - * <code>String</code> object, or return <code>null</code> if the retrieved - * value was <code>NULL</code>. */ + /** Retrieve the {@code long} value of the designated column in the + * current row of the given {@code ResultSet} object and format it as a + * {@code String} object, or return {@code null} if the retrieved + * value was {@code NULL}. */ private static String getLongFromResultSet(ResultSet rs, String columnLabel) throws SQLException { long result = rs.getLong(columnLabel); diff --git a/src/main/java/org/torproject/metrics/stats/clients/Database.java b/src/main/java/org/torproject/metrics/stats/clients/Database.java index f8bca92..abe363c 100644 --- a/src/main/java/org/torproject/metrics/stats/clients/Database.java +++ b/src/main/java/org/torproject/metrics/stats/clients/Database.java @@ -140,10 +140,10 @@ class Database implements AutoCloseable { return statistics; } - /** Retrieve the <code>int</code> value of the designated column in the - * current row of the given <code>ResultSet</code> object and format it as a - * <code>String</code> object, or return <code>null</code> if the retrieved - * value was <code>NULL</code>. */ + /** Retrieve the {@code int} value of the designated column in the + * current row of the given {@code ResultSet} object and format it as a + * {@code String} object, or return {@code null} if the retrieved + * value was {@code NULL}. */ private static String getIntFromResultSet(ResultSet rs, String columnLabel) throws SQLException { int result = rs.getInt(columnLabel); diff --git a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java index 8fb762d..454e3b2 100644 --- a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -351,19 +351,19 @@ public class Main { return statistics; } - /** Retrieves the <code>String</code> value of the designated column in the - * current row of the given <code>ResultSet</code> object, or returns the - * empty string if the retrieved value was <code>NULL</code>. */ + /** Retrieves the {@code String} value of the designated column in the + * current row of the given {@code ResultSet} object, or returns the + * empty string if the retrieved value was {@code NULL}. */ private static String getStringFromResultSet(ResultSet rs, String columnLabel) throws SQLException { String result = rs.getString(columnLabel); return null == result ? "" : result; } - /** Retrieves the <code>double</code> value of the designated column in the - * current row of the given <code>ResultSet</code> object as a - * <code>Double</code> object, or <code>null</code> if the retrieved value was - * <code>NULL</code>. */ + /** Retrieves the {@code double} value of the designated column in the + * current row of the given {@code ResultSet} object as a + * {@code Double} object, or {@code null} if the retrieved value was + * {@code NULL}. */ private static Double getDoubleFromResultSet(ResultSet rs, String columnLabel) throws SQLException { double result = rs.getDouble(columnLabel); diff --git a/src/main/java/org/torproject/metrics/stats/servers/Database.java b/src/main/java/org/torproject/metrics/stats/servers/Database.java index f7f1f0f..562ae34 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Database.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Database.java @@ -543,10 +543,10 @@ class Database implements AutoCloseable { return statistics; } - /** Retrieve the <code>long</code> value of the designated column in the - * current row of the given <code>ResultSet</code> object and format it as a - * <code>String</code> object, or return <code>null</code> if the retrieved - * value was <code>NULL</code>. */ + /** Retrieve the {@code long} value of the designated column in the + * current row of the given {@code ResultSet} object and format it as a + * {@code String} object, or return {@code null} if the retrieved + * value was {@code NULL}. */ private static String getLongFromResultSet(ResultSet rs, String columnLabel) throws SQLException { long result = rs.getLong(columnLabel); diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java b/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java index 3534e2a..60d03a5 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java @@ -26,7 +26,7 @@ class OutputLine { /** Date. */ LocalDate validAfterDate; - /** Nickname of the authority generating votes, or <code>null</code> in case + /** Nickname of the authority generating votes, or {@code null} in case * of consensuses. */ String nickname; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java b/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java index 7d7e095..72a9aad 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java @@ -14,7 +14,7 @@ import java.time.ZoneId; * data objects for them. */ class Parser { - /** Parse and return a consensus, but return <code>null</code> if the + /** Parse and return a consensus, but return {@code null} if the * consensus did not contain any bandwidth values. */ TotalcwRelayNetworkStatus parseRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) { @@ -45,7 +45,7 @@ class Parser { return parsedStatus; } - /** Parse and return a vote, but return <code>null</code> if the vote did not + /** Parse and return a vote, but return {@code null} if the vote did not * contain any bandwidth measurements. */ TotalcwRelayNetworkStatus parseRelayNetworkStatusVote( RelayNetworkStatusVote vote) { diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java b/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java index f9b6610..3f8822d 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java @@ -12,11 +12,11 @@ class TotalcwRelayNetworkStatus { LocalDateTime validAfter; /** The 1 to 19 character long alphanumeric nickname assigned to the authority - * by its operator, or <code>null</code> if this is a consensus. */ + * by its operator, or {@code null} if this is a consensus. */ String nickname; /** Uppercase hex fingerprint of the authority's (v3 authority) identity - * key, or <code>null</code> if this is a consensus. */ + * key, or {@code null} if this is a consensus. */ String identityHex; /** Sums of bandwidth measurements of all contained status entries with four

1 0

[metrics-web/master] Remove exception that is never thrown.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 61a61ac839deea6c6a5ecc3ecb2957be560a9955 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 16:03:07 2019 +0100 Remove exception that is never thrown. --- src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java b/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java index fc817e2..b80b805 100644 --- a/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java +++ b/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java @@ -28,7 +28,7 @@ public class ExoneraTorWrapperServlet extends AnyServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws IOException { request.setAttribute("categories", this.categories); this.exoneraTorServlet.doGet(request, response); }

1 0

[onionoo/master] Remove redundant local variable.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit e27191a0a735558d4d261934b1be8b4fe51089a6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:16:01 2019 +0100 Remove redundant local variable. --- src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 9489cba..81b428a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -449,13 +449,12 @@ public class DocumentStore { SortedSet<String> verifiedHostNames = null; SortedSet<String> unverifiedHostNames = null; Boolean recommendedVersion = null; - SummaryDocument summaryDocument = new SummaryDocument(isRelay, + return new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, asNumber, asName, contact, family, family, version, operatingSystem, verifiedHostNames, unverifiedHostNames, recommendedVersion); - return summaryDocument; } private <T extends Document> T retrieveDocumentFile(

1 0

[onionoo/master] Simplify comparison of Tor versions.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit dd58e89756efe94571b49b74a0f231c5c4323597 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:17:51 2019 +0100 Simplify comparison of Tor versions. --- src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java index fc25811..bba490c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java @@ -114,8 +114,8 @@ public class TorVersion implements Comparable<TorVersion> { } for (int position = 0; position < this.versionNumbers.size() && position < other.versionNumbers.size(); position++) { - if ((Integer.compare(this.versionNumbers.get(position), - other.versionNumbers.get(position))) != 0) { + if (!this.versionNumbers.get(position).equals( + other.versionNumbers.get(position))) { return false; } }

1 0

[exonerator/master] Avoid unnecessary continue and empty block.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit e50f0204455c68b9b785232640cf289f4be827e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:51:57 2019 +0100 Avoid unnecessary continue and empty block. --- .../torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 57eb5df..fcc534f 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -76,14 +76,10 @@ public class ExoneraTorDatabaseImporter { try { BufferedReader br = new BufferedReader(new FileReader(configFile)); while ((line = br.readLine()) != null) { - if (line.startsWith("#") || line.length() < 1) { - continue; - } else if (line.startsWith("ExoneraTorDatabaseJdbc")) { + if (line.startsWith("ExoneraTorDatabaseJdbc")) { jdbcString = line.split(" ")[1]; } else if (line.startsWith("ExoneraTorImportDirectory")) { importDirString = line.split(" ")[1]; - } else { - /* Ignore unrecognized configuration keys. */ } } br.close();

1 0