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

[exonerator/release] Remove Cobertura from the build process.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 4654ff9518d13daa65bafe69db92890e8700b3e0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 14 11:44:40 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 0d4300d..9f0db8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ copied to the `lib/` directory manually. Current dependency versions resolved by Ivy are the same as in Debian stretch with few exceptions. + - Remove Cobertura from the build process. # Changes in version 4.1.0 - 2019-05-13 diff --git a/src/build b/src/build index 256e619..75cda35 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f +Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097

1 0

[exonerator/release] Bump version to 4.1.0-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 106e2aab79a9ff853045aabeb9a8d6cc822bd898 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 15 08:53:03 2019 +0200 Bump version to 4.1.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index bbb7488..d60919a 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="4.1.0" /> + <property name="release.version" value="4.1.0-dev" /> <property name="metricslibversion" value="2.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[exonerator/master] Prepare for 4.2.0 release.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 5bf62c28764083e5fa3b7a3d4368e93c99ea0c51 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 21:28:37 2019 +0100 Prepare for 4.2.0 release. --- CHANGELOG.md | 3 ++- build.xml | 4 ++-- src/build | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddbae79..632f622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.2.0 - 2019-0?-?? +# Changes in version 4.2.0 - 2019-11-09 * Medium changes - Use Ivy for resolving external dependencies rather than relying @@ -12,6 +12,7 @@ few exceptions. - Remove Cobertura from the build process. - Update PostgreSQL JDBC driver version to 42.2.5. + - Update to metrics-lib 2.9.1. # Changes in version 4.1.0 - 2019-05-13 diff --git a/build.xml b/build.xml index 9d522fe..38fee16 100644 --- a/build.xml +++ b/build.xml @@ -9,8 +9,8 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="4.1.0-dev" /> - <property name="metricslibversion" value="2.6.2" /> + <property name="release.version" value="4.2.0" /> + <property name="metricslibversion" value="2.9.1" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="exonerator-${release.version}.war"/> diff --git a/src/build b/src/build index 62a964a..eb16cb3 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47 +Subproject commit eb16cb359db41722e6089bafb1e26808df4338df

1 0

[exonerator/master] Revert "Print out a warning if we're missing data."
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit a1fc853ce9889e404934b1cc942cc793240bec14 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 21:25:27 2019 +0100 Revert "Print out a warning if we're missing data." This reverts commit b0165cb03138e933a337ddc8400c3a8bbe889b3d. Turns out that worst case query time goes up from 3 to 58 seconds with the new query, which is unacceptable. We'll have to analyze and improve the query on the production database before merging this change. --- .../metrics/exonerator/ExoneraTorServlet.java | 43 ++++++---------------- .../metrics/exonerator/QueryResponse.java | 21 +---------- .../metrics/exonerator/QueryServlet.java | 24 +----------- src/main/resources/ExoneraTor.properties | 1 - src/main/sql/exonerator2.sql | 42 ++++++--------------- .../metrics/exonerator/ExoneraTorServletTest.java | 2 +- .../metrics/exonerator/QueryResponseTest.java | 12 ++---- 7 files changed, 33 insertions(+), 112 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 4b0cf16..a74aa60 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -89,7 +89,6 @@ public class ExoneraTorServlet extends HttpServlet { ExoneraTorDate firstDate = ExoneraTorDate.INVALID; ExoneraTorDate lastDate = ExoneraTorDate.INVALID; boolean noRelevantConsensuses = true; - boolean missingData = false; List<String[]> statusEntries = new ArrayList<>(); List<String> addressesInSameNetwork = null; @@ -106,14 +105,6 @@ public class ExoneraTorServlet extends HttpServlet { && queryResponse.relevantStatuses) { noRelevantConsensuses = false; } - if (null != queryResponse.missingStatuses - && queryResponse.missingStatuses) { - missingData = true; - } - if (null != queryResponse.missingExitLists - && queryResponse.missingExitLists) { - missingData = true; - } if (null != queryResponse.matches) { for (QueryResponse.Match match : queryResponse.matches) { StringBuilder sb = new StringBuilder(); @@ -219,18 +210,15 @@ public class ExoneraTorServlet extends HttpServlet { /* Print out result. */ } else { if (!statusEntries.isEmpty()) { - this.writeSummaryPositive(out, rb, relayIp, requestedDate.asString, - missingData); + this.writeSummaryPositive(out, rb, relayIp, requestedDate.asString); this.writeTechnicalDetails(out, rb, relayIp, requestedDate.asString, statusEntries); } else if (addressesInSameNetwork != null && !addressesInSameNetwork.isEmpty()) { this.writeSummaryAddressesInSameNetwork(out, rb, requestUrl, relayIp, - requestedDate.asString, langStr, addressesInSameNetwork, - missingData); + requestedDate.asString, langStr, addressesInSameNetwork); } else { - this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString, - missingData); + this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString); } this.writePermanentLink(out, rb, requestUrl, relayIp, requestedDate.asString, langStr); @@ -410,13 +398,13 @@ public class ExoneraTorServlet extends HttpServlet { private void writeSummaryNoTimestamp(PrintWriter out, ResourceBundle rb) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", - rb.getString("summary.invalidparams.notimestamp.title"), null, null, + rb.getString("summary.invalidparams.notimestamp.title"), null, rb.getString("summary.invalidparams.notimestamp.body")); } private void writeSummaryNoIp(PrintWriter out, ResourceBundle rb) { this.writeSummary(out, rb.getString("summary.heading"), - "panel-danger", rb.getString("summary.invalidparams.noip.title"), null, + "panel-danger", rb.getString("summary.invalidparams.noip.title"), null, rb.getString("summary.invalidparams.noip.body")); } @@ -425,7 +413,7 @@ public class ExoneraTorServlet extends HttpServlet { String lastDate) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", - rb.getString("summary.invalidparams.timestamprange.title"), null, null, + rb.getString("summary.invalidparams.timestamprange.title"), null, rb.getString("summary.invalidparams.timestamprange.body"), timestampStr, firstDate, lastDate); } @@ -450,7 +438,7 @@ public class ExoneraTorServlet extends HttpServlet { : StringEscapeUtils.escapeHtml4(timestampParameter); this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", - rb.getString("summary.invalidparams.invalidtimestamp.title"), null, + rb.getString("summary.invalidparams.invalidtimestamp.title"), null, rb.getString("summary.invalidparams.invalidtimestamp.body"), escapedTimestampParameter, "\"YYYY-MM-DD\""); } @@ -458,7 +446,7 @@ public class ExoneraTorServlet extends HttpServlet { private void writeSummaryTimestampTooRecent(PrintWriter out, ResourceBundle rb) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", - rb.getString("summary.invalidparams.timestamptoorecent.title"), null, + rb.getString("summary.invalidparams.timestamptoorecent.title"), null, rb.getString("summary.invalidparams.timestamptoorecent.body")); } @@ -477,8 +465,7 @@ public class ExoneraTorServlet extends HttpServlet { void writeSummaryAddressesInSameNetwork(PrintWriter out, ResourceBundle rb, String requestUrl, String relayIp, String timestampStr, - String langStr, List<String> addressesInSameNetwork, - boolean missingData) { + String langStr, List<String> addressesInSameNetwork) { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; for (int i = 0; i < addressesInSameNetwork.size(); i++) { String addressInSameNetwork = addressesInSameNetwork.get(i); @@ -499,36 +486,33 @@ public class ExoneraTorServlet extends HttpServlet { this.writeSummary(out, rb.getString("summary.heading"), "panel-warning", rb.getString("summary.negativesamenetwork.title"), panelItems, - missingData ? rb.getString("summary.missingdata") : null, rb.getString("summary.negativesamenetwork.body"), relayIp, timestampStr, relayIp.contains(":") ? 48 : 24); } private void writeSummaryPositive(PrintWriter out, ResourceBundle rb, - String relayIp, String timestampStr, boolean missingData) { + String relayIp, String timestampStr) { String formattedRelayIp = relayIp.contains(":") ? "[" + relayIp + "]" : relayIp; this.writeSummary(out, rb.getString("summary.heading"), "panel-success", rb.getString("summary.positive.title"), null, - missingData ? rb.getString("summary.missingdata") : null, rb.getString("summary.positive.body"), formattedRelayIp, timestampStr); } private void writeSummaryNegative(PrintWriter out, ResourceBundle rb, - String relayIp, String timestampStr, boolean missingData) { + String relayIp, String timestampStr) { String formattedRelayIp = relayIp.contains(":") ? "[" + relayIp + "]" : relayIp; this.writeSummary(out, rb.getString("summary.heading"), "panel-warning", rb.getString("summary.negative.title"), null, - missingData ? rb.getString("summary.missingdata") : null, rb.getString("summary.negative.body"), formattedRelayIp, timestampStr); } private void writeSummary(PrintWriter out, String heading, String panelContext, String panelTitle, Object[][] panelItems, - String panelWarning, String panelBodyTemplate, Object... panelBodyArgs) { + String panelBodyTemplate, Object... panelBodyArgs) { out.printf(" <div class=\"row\">\n" + " <div class=\"col-xs-12\">\n" + " <h2>%s</h2>\n" @@ -547,9 +531,6 @@ public class ExoneraTorServlet extends HttpServlet { } out.print(" </ul>\n"); } - if (null != panelWarning) { - out.printf(" <p>%s</p>\n", panelWarning); - } out.print(" </div>\n" + " </div>\n" + " </div>\n" diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index d148d0c..6a8976a 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -21,7 +21,7 @@ public class QueryResponse { private static Logger logger = LoggerFactory.getLogger(QueryResponse.class); /* Actual version implemented by this class. */ - private static final String VERSION = "1.1"; + private static final String VERSION = "1.0"; /* Don't accept query responses with versions lower than this. */ private static final String FIRSTRECOGNIZEDVERSION = "1.0"; @@ -60,20 +60,6 @@ public class QueryResponse { * a day of the requested date; {@code null} if the database is empty. */ Boolean relevantStatuses; - /** Whether there are at least 18 hours of statuses missing in the database - * within a day of the requested date; {@code null} if the database is - * empty. - * - * @since 1.1 */ - Boolean missingStatuses; - - /** Whether there are at least 18 hours of exit lists missing in the database - * from two days before the requested date until one day after; {@code null} - * if the database is empty. - * - * @since 1.1 */ - Boolean missingExitLists; - /** All matches for the given IP address and date; {@code null} if there * were no matches at all. */ Match[] matches; @@ -84,16 +70,13 @@ public class QueryResponse { /** Constructor for tests. */ QueryResponse(String version, String queryAddress, String queryDate, String firstDateInDatabase, String lastDateInDatabase, - Boolean relevantStatuses, Boolean missingStatuses, - Boolean missingExitLists, Match[] matches, String[] nearbyAddresses) { + Boolean relevantStatuses, Match[] matches, String[] nearbyAddresses) { this.version = version; this.queryAddress = queryAddress; this.queryDate = queryDate; this.firstDateInDatabase = firstDateInDatabase; this.lastDateInDatabase = lastDateInDatabase; this.relevantStatuses = relevantStatuses; - this.missingStatuses = missingStatuses; - this.missingExitLists = missingExitLists; this.matches = matches; this.nearbyAddresses = nearbyAddresses; } diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index 17980a9..760e385 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -54,10 +54,6 @@ public class QueryServlet extends HttpServlet { = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss") .withZone(ZoneOffset.UTC); - private static final int MISSING_STATUSES_IF_LESS_THAN = 3 * 24 - 17; - - private static final int MISSING_EXIT_LISTS_IF_LESS_THAN = 4 * 24 - 17; - @Override public void init() { this.logger = LoggerFactory.getLogger(QueryServlet.class); @@ -268,14 +264,6 @@ public class QueryServlet extends HttpServlet { * {first|last}_date_in_database and relevant_statuses fields. */ SortedSet<LocalDate> allDates = new TreeSet<>(); - /* Store all hours for which the database contains relevant status - * entries. */ - Set<LocalDateTime> allStatusHours = new HashSet<>(); - - /* Store all hours for which the database contains relevant exit list - * entries. */ - Set<LocalDateTime> allExitListHours = new HashSet<>(); - /* Store all possible matches for the results table by base64-encoded * fingerprint and valid-after time. This map is first populated by going * through the result set and adding or updating map entries, so that @@ -321,12 +309,12 @@ public class QueryServlet extends HttpServlet { String orAddress = rs.getString(8); if (null != date) { allDates.add(date); - } else if (null != scanned && null != fingerprintBase64) { + } else if (null != scanned) { exitAddressesByFingeprintBase64AndScanned.putIfAbsent( fingerprintBase64, new TreeMap<>()); exitAddressesByFingeprintBase64AndScanned.get(fingerprintBase64) .put(scanned, exitAddress); - } else if (null != validAfter && null != fingerprintBase64) { + } else if (null != validAfter) { matchesByFingerprintBase64AndValidAfter.putIfAbsent( fingerprintBase64, new TreeMap<>()); if (!matchesByFingerprintBase64AndValidAfter @@ -350,10 +338,6 @@ public class QueryServlet extends HttpServlet { } matchesByAddress.putIfAbsent(orAddress, new HashSet<>()); matchesByAddress.get(orAddress).add(match); - } else if (null != validAfter) { - allStatusHours.add(validAfter); - } else if (null != scanned) { - allExitListHours.add(scanned); } } } catch (SQLException e) { @@ -410,10 +394,6 @@ public class QueryServlet extends HttpServlet { || allDates.contains(timestamp.minusDays(1L)) || allDates.contains(timestamp.plusDays(1L)); } - response.missingStatuses = allStatusHours.size() - < MISSING_STATUSES_IF_LESS_THAN; - response.missingExitLists = allExitListHours.size() - < MISSING_EXIT_LISTS_IF_LESS_THAN; if (matchesByAddress.containsKey(relayIp)) { List<QueryResponse.Match> matchesList = new ArrayList<>(matchesByAddress.get(relayIp)); diff --git a/src/main/resources/ExoneraTor.properties b/src/main/resources/ExoneraTor.properties index a67d880..05bb0cb 100644 --- a/src/main/resources/ExoneraTor.properties +++ b/src/main/resources/ExoneraTor.properties @@ -30,7 +30,6 @@ summary.positive.title=Result is positive summary.positive.body=We found one or more Tor relays on IP address %s on or within a day of %s that Tor clients were likely to know. summary.negative.title=Result is negative summary.negative.body=We did not find IP address %s on or within a day of %s. -summary.missingdata=However, the database is missing several hours of data for this specific request, so that this result must be interpreted carefully. technicaldetails.heading=Technical details technicaldetails.pre=Looking up IP address %s on or within one day of %s. Tor clients could have selected this or these Tor relays to build circuits. technicaldetails.colheader.timestamp=Timestamp (UTC) diff --git a/src/main/sql/exonerator2.sql b/src/main/sql/exonerator2.sql index ef017d3..397d2bf 100755 --- a/src/main/sql/exonerator2.sql +++ b/src/main/sql/exonerator2.sql @@ -279,24 +279,20 @@ CREATE OR REPLACE FUNCTION insert_exitlistentry_exitaddress ( END; $$ LANGUAGE 'plpgsql'; --- Search by date and /24 IPv4 or IPv6 prefix for: --- - exit list entries with an IPv4 exit address in the same /24 network and --- with a scan time not earlier than two days before and not later than one --- day after the given date, --- - status entries with an IPv4 or IPv6 onion routing address in the same /24 --- network as the given hex-encoded IP address prefix and with a valid-after --- date within a day of the given date, --- - the first and last dates in the database as well as the dates for which --- the database contains relevant data within a day of the given date, --- - the hours for which the database contains relevant exit list entries, and --- - the hours for which the database contains relevant status entries. +-- Search for (1) status entries with an IPv4 or IPv6 onion routing address in +-- the same /24 network as the given hex-encoded IP address prefix and with a +-- valid-after date within a day of the given date, (2) exit list entries with +-- an IPv4 exit address in the same /24 network and with a scan time not earlier +-- than two days before and not later than one day after the given date, and (3) +-- the last and first dates in the database as well as the dates for which the +-- database contains relevant data within a day of the given date. -- -- This function makes heavy use of the date_address24 table in order to reduce -- query response time by first obtaining all relevant fingerprint identifiers. --- In the next step it runs five selects to obtain status entries, exit list --- entries, relevant dates, and relevant hours. Any postprocessing, including --- filtering by exact IP address or matching status entries and exit list --- entries, needs to happen at the caller. +-- In the next step it runs three selects to obtain status entries, exit list +-- entries, and relevant dates. Any postprocessing, including filtering by exact +-- IP address or matching status entries and exit list entries, needs to happen +-- at the caller. CREATE OR REPLACE FUNCTION search_by_date_address24 ( search_date DATE, search_address24 CHARACTER(6)) RETURNS TABLE( @@ -343,21 +339,7 @@ CREATE OR REPLACE FUNCTION search_by_date_address24 ( WHERE date IN (SELECT MIN(date) FROM date_address24 UNION SELECT MAX(date) FROM date_address24 UNION SELECT date FROM date_address24 - WHERE date >= $1 - 1 AND date <= $1 + 1) - UNION - SELECT NULL AS date, NULL AS fingerprint_base64, - DATE_TRUNC(''hour'', scanned) AS scanned, NULL AS exitaddress, - NULL AS validafter, NULL AS nickname, NULL AS exit, NULL AS oraddress - FROM exitlistentry_exitaddress - WHERE DATE(exitlistentry_exitaddress.scanned) >= $1 - 2 - AND DATE(exitlistentry_exitaddress.scanned) <= $1 + 1 - UNION - SELECT NULL AS date, NULL AS fingerprint_base64, NULL AS scanned, - NULL AS exitaddress, DATE_TRUNC(''hour'', validafter) AS validafter, - NULL AS nickname, NULL AS exit, NULL AS oraddress - FROM statusentry_oraddress - WHERE DATE(statusentry_oraddress.validafter) >= $1 - 1 - AND DATE(statusentry_oraddress.validafter) <= $1 + 1' + WHERE date >= $1 - 1 AND date <= $1 + 1)' USING search_date, search_address24; END; $$ LANGUAGE plpgsql; diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 64656da..1ede590 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java @@ -50,7 +50,7 @@ public class ExoneraTorServletTest { StringWriter sw = new StringWriter(); es.writeSummaryAddressesInSameNetwork(new PrintWriter(sw), rb, "http://localhost:8080/", qr.queryAddress, qr.queryDate, "en", - Arrays.asList(qr.nearbyAddresses), false); + Arrays.asList(qr.nearbyAddresses)); String errorMsg = "Test data:" + QueryResponse.toJson(qr) + "\nresult:\n" + sw.toString(); assertTrue(errorMsg, diff --git a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java index 826da1c..97ae88d 100644 --- a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java @@ -42,12 +42,10 @@ public class QueryResponseTest { + "\"exit\":false}],\"nearby_addresses\":[\"12.13.14.15\"," + "\"12.13.14.16\"]}"}, {new QueryResponse("1.1", null, null, null, - null, false, true, true, null, null), - "{\"version\":\"1.1\",\"relevant_statuses\":false," - + "\"missing_statuses\":true," - + "\"missing_exit_lists\":true}"}, + null, false, null, null), + "{\"version\":\"1.1\",\"relevant_statuses\":false}"}, {new QueryResponse("1.0", "12.13.14.15", "2016-12-12", "2016-01-01", - "2016-12-31", true, false, false, + "2016-12-31", true, new QueryResponse.Match[]{new QueryResponse.Match("2016-12-03", new TreeSet<>(Arrays.asList("12.13.14.15", "12.13.14.16")), "fingerprint-not-checked", "some name", true), @@ -61,8 +59,6 @@ public class QueryResponseTest { + "\"first_date_in_database\":\"2016-01-01\"," + "\"last_date_in_database\":\"2016-12-31\"," + "\"relevant_statuses\":true," - + "\"missing_statuses\":false," - + "\"missing_exit_lists\":false," + "\"matches\":[{\"timestamp\":\"2016-12-03\"," + "\"addresses\":[\"12.13.14.15\"," + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," @@ -74,7 +70,7 @@ public class QueryResponseTest { + "\"exit\":false}],\"nearby_addresses\":[\"12.13.14.15\"," + "\"12.13.14.16\"]}"}, {new QueryResponse("1.0", "12.13.14.15", "2016-12-12", "2016-01-01", - "2016-12-31", false, null, null, + "2016-12-31", false, new QueryResponse.Match[]{new QueryResponse.Match("2016-12-03", new TreeSet<>(Arrays.asList("12.13.14.15", "12.13.14.16")), "fingerprint-not-checked", "some name", null),

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit 1e098c0765be86f1be07633e7d2adfebcb807ab2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 19:18:35 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index 1af4367ff..e9ac201c5 100644 --- a/sv.po +++ b/sv.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:17+0200\n" -"PO-Revision-Date: 2019-11-09 16:27+0000\n" +"PO-Revision-Date: 2019-11-09 19:03+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -136,7 +136,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "" +msgstr "<b>Du bör göra en manuell uppgradering till %{name}s %{version}s.</b>\n\nFör mer information om den här nya versionen, gå till %{details_url}s\n\nDet är inte möjligt att automatiskt uppgradera enheten till den nya versionen: %{explanation}s.\n\nOm du vill veta hur du gör en manuell uppgradering, gå till https://tails.boum.org/doc/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available"

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit e6490791bcf32d40624c0de10243992eca7ce325 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 19:16:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+sv.po | 1 + 1 file changed, 1 insertion(+) diff --git a/code_of_conduct+sv.po b/code_of_conduct+sv.po index 58115745a..95bcf919c 100644 --- a/code_of_conduct+sv.po +++ b/code_of_conduct+sv.po @@ -124,6 +124,7 @@ msgstr "" #, no-wrap msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" msgstr "" +" GÖR: Låt oss höra andras tankar. Lyssna. Se till att alla blir hörda.\n" #. type: Plain text #: ../code_of_conduct.txt:40

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit 6865fdf29553e6d74a681868f9614bbe3af99c3e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 18:53:45 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 6 +++++- contents+sv.po | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+it.po b/contents+it.po index 61279e6e3..408e82b31 100644 --- a/contents+it.po +++ b/contents+it.po @@ -5317,7 +5317,7 @@ msgstr "" #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) msgid "MyFamily $fingerprint1,$fingerprint2,$fingerprint3" -msgstr "" +msgstr "MyFamily $fingerprint1,$fingerprint2,$fingerprint3" #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -5325,6 +5325,8 @@ msgid "" "where each fingerprint is the 40 character identity fingerprint (without " "spaces)." msgstr "" +"dove ogni fingerprint è l'impronta di identificazione di 40 caratteri (senza" +" spazi)." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -5332,6 +5334,8 @@ msgid "" "That way, Tor clients will know to avoid using more than one of your relays " "in a single circuit." msgstr "" +"In questo modo, i client Tor sapranno evitare l'uso di multipli tuoi relè in" +" un singolo circuito. " #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) diff --git a/contents+sv.po b/contents+sv.po index 1f6ed9f4c..234f5a745 100644 --- a/contents+sv.po +++ b/contents+sv.po @@ -8170,7 +8170,7 @@ msgstr "" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "Spårning, övervakning och censur är utbrett på nätet." #: lego/templates/banner.html:14 templates/banner.html:14 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit 6f48c1c56d6ff11f72d43aa1f1c6a13ee53aaf9c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 18:53:09 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+sv.po b/contents+sv.po index 4bb715c0b..9c1f44221 100644 --- a/contents+sv.po +++ b/contents+sv.po @@ -2,9 +2,9 @@ # Anton Strömkvist <inactive+Lumen(a)transifex.com>, 2019 # Martin Coborn <inactive+martincoborn(a)transifex.com>, 2019 # Jonas Franzén, 2019 -# Jonatan Nyberg, 2019 # erinm, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 +# Jonatan Nyberg, 2019 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-06 15:48+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019\n" +"Last-Translator: Jonatan Nyberg, 2019\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -602,7 +602,7 @@ msgstr "" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "Spårning, övervakning och censur är utbrett på nätet." #: lego/templates/banner.html:14 templates/banner.html:14 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit b6d75a7cf4a75cd14f3e62afe2a8e133d6081052 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 18:52:55 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv/network-settings.dtd | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index e412e5761..121d5a7af 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> -<!ENTITY torsettings.useProxy.type "Proxytyp:"> +<!ENTITY torsettings.useProxy.type ""> <!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp"> -<!ENTITY torsettings.useProxy.address "Adress:"> +<!ENTITY torsettings.useProxy.address ""> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Användarnamn:"> -<!ENTITY torsettings.useProxy.password "Lösenord:"> +<!ENTITY torsettings.useProxy.port ""> +<!ENTITY torsettings.useProxy.username ""> +<!ENTITY torsettings.useProxy.password ""> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denna dator går genom en brandvägg som bara tillåter anslutningar på vissa specifika portar."> -<!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:"> +<!ENTITY torsettings.firewall.allowedPorts ""> <!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land"> <!ENTITY torsettings.useBridges.default "Välj en inbyggd bro"> <!ENTITY torsettings.useBridges.default.placeholder "Välj en bro"> @@ -60,3 +60,24 @@  <!ENTITY torprogress.pleaseWait "Var god och vänta medan vi etablerar en anslutning till Tor-nätverket.   Detta kan ta upp till flera minuter."> + + +<!ENTITY torPreferences.categoryTitle ""> +<!ENTITY torPreferences.torSettings ""> +<!ENTITY torPreferences.torSettingsDescription "" > +<!ENTITY torPreferences.learnMore ""> +<!ENTITY torPreferences.bridges ""> +<!ENTITY torPreferences.bridgesDescription ""> +<!ENTITY torPreferences.useBridge ""> +<!ENTITY torPreferences.requestNewBridge ""> +<!ENTITY torPreferences.provideBridge ""> +<!ENTITY torPreferences.advanced ""> +<!ENTITY torPreferences.advancedDescription ""> +<!ENTITY torPreferences.firewallPortsPlaceholder ""> +<!ENTITY torPreferences.requestBridgeDialogTitle ""> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt ""> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt ""> +<!ENTITY torPreferences.requestBridgeErrorBadSolution ""> +<!ENTITY torPreferences.viewTorLogs ""> +<!ENTITY torPreferences.viewLogs ""> +<!ENTITY torPreferences.torLogsDialogTitle "">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit c49ac6f40b914b1484d56c1c9f638ae5674f487d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 18:52:50 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv/network-settings.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index 88d7c1ba6..a346d0c1e 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor-inställningar"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen." > <!ENTITY torPreferences.learnMore "Läs mer"> <!ENTITY torPreferences.bridges "Broar"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Broar hjälper dig att komma åt Tor-nätverket på platser där Tor är blockerat. Beroende på var du är, kan en bro fungera bättre än en annan."> +<!ENTITY torPreferences.useBridge "Använd en bro"> <!ENTITY torPreferences.requestNewBridge "Begär en ny bro..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Tillhandahålla en bro"> <!ENTITY torPreferences.advanced "Avancerat"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Konfigurera hur Tor Browser ansluter till internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerade värden"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Begär bro"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktar BridgeDB. Vänligen vänta."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lös CAPTCHA:n för att begära en bro."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Lösningen är inte korrekt. Vänligen försök igen."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Visa Tor-loggarna."> +<!ENTITY torPreferences.viewLogs "Visa loggar…"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-loggar">

1 0