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

[tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
by nickm＠torproject.org 06 Feb '18

06 Feb '18

commit b5a8fd1566e137f27c49d132755d2ad9e5c74f4e Merge: f0d7905bc f08fa9746 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 5 14:00:50 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/or/geoip.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Feb '18

06 Feb '18

commit c2601c679e4aa40b76838d660d1fa335120efa28 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 19:15:06 2018 +0000 Update translations for bridgedb --- ti/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ti/LC_MESSAGES/bridgedb.po b/ti/LC_MESSAGES/bridgedb.po index f638ac305..bfd58a5ae 100644 --- a/ti/LC_MESSAGES/bridgedb.po +++ b/ti/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-05 15:24+0000\n" +"PO-Revision-Date: 2018-02-05 19:09+0000\n" "Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" @@ -136,7 +136,7 @@ msgstr "" #: bridgedb/https/templates/options.html:86 msgid "No" -msgstr "" +msgstr "ኖ" #: bridgedb/https/templates/options.html:87 msgid "none"

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit e516d4292eac731e1c242cef2441f7ed2824ec73 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 17:47:13 2018 +0000 Update translations for abouttor-homepage --- om/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/om/aboutTor.dtd b/om/aboutTor.dtd index 676878e27..63b293816 100644 --- a/om/aboutTor.dtd +++ b/om/aboutTor.dtd @@ -18,7 +18,7 @@ <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.search.label "Search"> +<!ENTITY aboutTor.search.label "Barbaadi"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torInfo1.label "Additional Info:">

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit 8d84f88ae41e373a30c8b9c10fabceaaf66d48eb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 17:45:15 2018 +0000 Update translations for torcheck --- om/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/om/torcheck.po b/om/torcheck.po index be98a0e25..e59c619e4 100644 --- a/om/torcheck.po +++ b/om/torcheck.po @@ -72,7 +72,7 @@ msgid "Learn More »" msgstr "" msgid "Go" -msgstr "" +msgstr "Deemi" msgid "Short User Manual" msgstr ""

1 0

[user-manual/alpha] Pushing fr images
by colin＠torproject.org 05 Feb '18

05 Feb '18

commit 18d457fb7675b729fbd9a92677294145e94bc64d Author: Colin Childs <colin(a)torproject.org> Date: Mon Feb 5 11:23:28 2018 -0600 Pushing fr images --- fr/media/circumvention/bridges.png | Bin 114409 -> 226235 bytes fr/media/circumvention/configure.png | Bin 77809 -> 294494 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/fr/media/circumvention/bridges.png b/fr/media/circumvention/bridges.png index 896fb2f..edc5f0e 100644 Binary files a/fr/media/circumvention/bridges.png and b/fr/media/circumvention/bridges.png differ diff --git a/fr/media/circumvention/configure.png b/fr/media/circumvention/configure.png index e18219c..d33acd5 100644 Binary files a/fr/media/circumvention/configure.png and b/fr/media/circumvention/configure.png differ

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 05 Feb '18

05 Feb '18

commit 9382135e5ac76354259c0710357e930cddb59e67 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 5 17:20:39 2018 +0000 Update translations for exoneratorproperties --- om/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/om/exonerator.properties b/om/exonerator.properties index e35c687d4..b9a0da95c 100644 --- a/om/exonerator.properties +++ b/om/exonerator.properties @@ -1,7 +1,7 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: form.ip.label=IP address form.timestamp.label=Date -form.search.label=Search +form.search.label=Barbaadi summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. Please try again later. If this problem persists, please %s!

1 0

[collector/master] Use enum Method from metrics-lib.
by karsten＠torproject.org 05 Feb '18

05 Feb '18

commit 2a0aa8c7f8c956ba15c5780bc078d5330322fcd5 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:24 2018 +0000 Use enum Method from metrics-lib. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 88d62fa..a3d2a7e 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -15,6 +15,7 @@ import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.WebServerAccessLog; import org.torproject.descriptor.log.InternalLogDescriptor; import org.torproject.descriptor.log.InternalWebServerAccessLog; +import org.torproject.descriptor.log.Method; import org.torproject.descriptor.log.WebServerAccessLogImpl; import org.torproject.descriptor.log.WebServerAccessLogLine; @@ -146,8 +147,8 @@ public class SanitizeWeblogs extends CollecTorMain { static Optional<String> sanitize(WebServerAccessLogLine logLine, LocalDate date) { if (!logLine.isValid() - || !("GET".equals(logLine.getMethod()) - || "HEAD".equals(logLine.getMethod())) + || !(Method.GET == logLine.getMethod() + || Method.HEAD == logLine.getMethod()) || !logLine.getProtocol().startsWith("HTTP") || 400 == logLine.getResponse() || 404 == logLine.getResponse()) { return Optional.empty();

1 0

[collector/master] Avoid repeated validation of clean and validated log lines.
by karsten＠torproject.org 05 Feb '18

05 Feb '18

commit 06d1a81d4cfe8ce89caa6cf49124f6700b33f522 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:28 2018 +0000 Avoid repeated validation of clean and validated log lines. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 635457c..53ad118 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -136,7 +136,7 @@ public class SanitizeWeblogs extends CollecTorMain { try { WebServerAccessLogPersistence walp = new WebServerAccessLogPersistence( - new WebServerAccessLogImpl(retainedLines, name)); + new WebServerAccessLogImpl(retainedLines, name, false)); log.debug("Storing {}.", name); walp.storeOut(this.outputPathName); walp.storeRecent(this.recentPathName);

1 0

[collector/master] Optimize parallel processing and use static imports for readability.
by karsten＠torproject.org 05 Feb '18

05 Feb '18

commit bd948070e03ff71503fdba84cff6bc61c9fbe452 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:26 2018 +0000 Optimize parallel processing and use static imports for readability. --- .../torproject/collector/webstats/SanitizeWeblogs.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 4496861..635457c 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -3,6 +3,9 @@ package org.torproject.collector.webstats; +import static java.util.stream.Collectors.groupingByConcurrent; +import static java.util.stream.Collectors.toList; + import org.torproject.collector.conf.Configuration; import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; @@ -37,7 +40,6 @@ import java.util.SortedSet; import java.util.StringJoiner; import java.util.TreeMap; import java.util.TreeSet; -import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -106,10 +108,9 @@ public class SanitizeWeblogs extends CollecTorMain { log.info("Processing logs for {} on {}.", virtualHost, physicalHost); Map<LocalDate, List<WebServerAccessLogLine>> linesByDate = physicalEntry.getValue().values().stream().parallel() - .flatMap((LogMetadata metadata) - -> lineStream(metadata).filter((line) -> line.isValid())) - .collect(Collectors.groupingBy(WebServerAccessLogLine::getDate, - Collectors.toList())); + .flatMap((LogMetadata metadata) -> lineStream(metadata) + .filter((line) -> line.isValid())).parallel() + .collect(groupingByConcurrent(WebServerAccessLogLine::getDate)); LocalDate[] interval = determineInterval(linesByDate.keySet()); linesByDate.entrySet().stream() .filter((entry) -> entry.getKey().isAfter(interval[0]) @@ -130,7 +131,7 @@ public class SanitizeWeblogs extends CollecTorMain { List<String> retainedLines = lines .stream().parallel().map((line) -> sanitize(line, date)) .filter((line) -> line.isPresent()).map((line) -> line.get()) - .collect(Collectors.toList()); + .collect(toList()); retainedLines.sort(null); try { WebServerAccessLogPersistence walp @@ -142,6 +143,7 @@ public class SanitizeWeblogs extends CollecTorMain { } catch (DescriptorParseException dpe) { log.error("Cannot store log desriptor {}.", name, dpe); } + lines.clear(); } static Optional<String> sanitize(WebServerAccessLogLine logLine, @@ -188,7 +190,7 @@ public class SanitizeWeblogs extends CollecTorMain { metadata.fileType.decompress(Files.readAllBytes(metadata.path)))))) { return br.lines() .map((String line) -> WebServerAccessLogLine.makeLine(line)) - .collect(Collectors.toList()).stream(); + .collect(toList()).stream(); } catch (Exception ex) { log.debug("Skipping log-file {}.", metadata.path, ex); }

1 0

[collector/master] Parallelize two more processing steps.
by karsten＠torproject.org 05 Feb '18

05 Feb '18

commit 15db1e2a793ac7e67a1e7aa87c2ea857825a98a2 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 31 13:31:25 2018 +0000 Parallelize two more processing steps. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index a3d2a7e..4496861 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -113,7 +113,7 @@ public class SanitizeWeblogs extends CollecTorMain { LocalDate[] interval = determineInterval(linesByDate.keySet()); linesByDate.entrySet().stream() .filter((entry) -> entry.getKey().isAfter(interval[0]) - && entry.getKey().isBefore(interval[1])) + && entry.getKey().isBefore(interval[1])).parallel() .forEach((entry) -> storeSanitized(virtualHost, physicalHost, entry.getKey(), entry.getValue())); } @@ -128,7 +128,7 @@ public class SanitizeWeblogs extends CollecTorMain { .add(date.format(DateTimeFormatter.BASIC_ISO_DATE)).toString(); log.debug("Sanitizing {}.", name); List<String> retainedLines = lines - .stream().map((line) -> sanitize(line, date)) + .stream().parallel().map((line) -> sanitize(line, date)) .filter((line) -> line.isPresent()).map((line) -> line.get()) .collect(Collectors.toList()); retainedLines.sort(null);

1 0