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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit afd495d89e8354ae0d64252bfd4369b45270da32 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 22:16:15 2018 +0000 Update translations for tor-launcher-properties --- nl/torlauncher.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nl/torlauncher.properties b/nl/torlauncher.properties index e2d4b6985..9b19476d9 100644 --- a/nl/torlauncher.properties +++ b/nl/torlauncher.properties @@ -34,9 +34,9 @@ torlauncher.bridge_suffix.meek-azure=(werkt in China) torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is verbroken. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met de proxy.

1 0

[stem/master] Drop compression from _download_descriptors() args
by atagar＠torproject.org 04 Apr '18

04 Apr '18

commit c1da1a4af97c808b479e424b5666bb702a7b597a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 2 10:28:19 2018 -0700 Drop compression from _download_descriptors() args Oops, stupid me. The only reason retries are an arg for this method is so we can deprecate while iterating. We can just reference self.compression here instead. --- stem/descriptor/remote.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index e1190fc7..97fd1e5c 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -430,7 +430,7 @@ class Query(object): self._downloader_thread = threading.Thread( name = 'Descriptor Query', target = self._download_descriptors, - args = (self.compression, self.retries,) + args = (self.retries,) ) self._downloader_thread.setDaemon(True) @@ -520,7 +520,7 @@ class Query(object): return 'http://%s:%i/%s' % (address, dirport, self.resource.lstrip('/')) - def _download_descriptors(self, compression, retries): + def _download_descriptors(self, retries): try: use_authority = retries == 0 and self.fall_back_to_authority self.download_url = self._pick_url(use_authority) @@ -529,7 +529,7 @@ class Query(object): response = urllib.urlopen( urllib.Request( self.download_url, - headers = {'Accept-Encoding': ', '.join(compression)}, + headers = {'Accept-Encoding': ', '.join(self.compression)}, ), timeout = self.timeout, ) @@ -564,7 +564,7 @@ class Query(object): if retries > 0: log.debug("Unable to download descriptors from '%s' (%i retries remaining): %s" % (self.download_url, retries, exc)) - return self._download_descriptors(compression, retries - 1) + return self._download_descriptors(retries - 1) else: log.debug("Unable to download descriptors from '%s': %s" % (self.download_url, exc)) self.error = exc

1 0

[stem/master] Deprecate server descriptor's hidden_service_dir field
by atagar＠torproject.org 04 Apr '18

04 Apr '18

commit b5b22ec965135263f26d25e7cd338d82828f3e84 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 4 13:53:18 2018 -0700 Deprecate server descriptor's hidden_service_dir field This field has never been populated... https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78 We'll drop it in Stem 2.0. Interestingly when we added this I forgot to include it in our docs so... cool. Think I won't correct that. ;P --- stem/descriptor/server_descriptor.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 8aed42c6..4f2bcbec 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -341,10 +341,11 @@ def _parse_hibernating_line(descriptor, entries): def _parse_hidden_service_dir_line(descriptor, entries): value = _value('hidden-service-dir', entries) - if value: - descriptor.hidden_service_dir = value.split(' ') - else: - descriptor.hidden_service_dir = ['2'] + # TODO: Remove the following field in Stem 2.0. It has never been populated... + # + # https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78 + + descriptor.hidden_service_dir = ['2'] def _parse_uptime_line(descriptor, entries): @@ -527,6 +528,10 @@ class ServerDescriptor(Descriptor): .. versionchanged:: 1.6.0 Added the extra_info_sha256_digest, protocols, and bridge_distribution attributes. + + .. versionchanged:: 1.7.0 + Deprecated the hidden_service_dir field, it's never been populated + (:spec:`43c2f78`). This field will be removed in Stem 2.0. """ ATTRIBUTES = {

1 0

[onionoo/master] Add version_status field to details documents.
by karsten＠torproject.org 04 Apr '18

04 Apr '18

commit 76dec0651148e99d069ab798693b22a33162b6b8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 22 20:59:31 2018 +0100 Add version_status field to details documents. Implements #24256. --- CHANGELOG.md | 3 + .../torproject/onionoo/docs/DetailsDocument.java | 10 ++ .../org/torproject/onionoo/docs/DetailsStatus.java | 10 ++ .../org/torproject/onionoo/docs/NodeStatus.java | 17 +++ .../torproject/onionoo/server/ResponseBuilder.java | 2 + .../onionoo/updater/NodeDetailsStatusUpdater.java | 23 +++- .../org/torproject/onionoo/updater/TorVersion.java | 150 +++++++++++++++++++++ .../onionoo/updater/TorVersionStatus.java | 47 +++++++ .../onionoo/writer/DetailsDocumentWriter.java | 1 + .../torproject/onionoo/updater/TorVersionTest.java | 127 +++++++++++++++++ 10 files changed, 384 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a3c468..36d6471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 5.1-1.12.0 - 2018-??-?? + * Medium changes + - Add version_status field to details documents. + * Minor changes - Don't attempt to un-escape character sequences in contact lines (like "\uk") that only happen to start like escaped utf-8 characters diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index c749fba..e112efe 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -356,6 +356,16 @@ public class DetailsDocument extends Document { return this.version; } + private String version_status; + + public void setVersionStatus(String versionStatus) { + this.version_status = versionStatus; + } + + public String getVersionStatus() { + return this.version_status; + } + private SortedSet<String> alleged_family; public void setAllegedFamily(SortedSet<String> allegedFamily) { diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index c3cdc28..f838ec0 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -550,5 +550,15 @@ public class DetailsStatus extends Document { public String getVersion() { return this.version; } + + private String version_status; + + public void setVersionStatus(String versionStatus) { + this.version_status = versionStatus; + } + + public String getVersionStatus() { + return this.version_status; + } } diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 94da8c8..1ea8b98 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -3,6 +3,8 @@ package org.torproject.onionoo.docs; +import org.torproject.onionoo.updater.TorVersionStatus; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -330,6 +332,16 @@ public class NodeStatus extends Document { return this.version; } + private TorVersionStatus versionStatus; + + public void setVersionStatus(TorVersionStatus versionStatus) { + this.versionStatus = versionStatus; + } + + public TorVersionStatus getVersionStatus() { + return this.versionStatus; + } + /* From exit lists: */ private SortedSet<String> exitAddresses; @@ -572,6 +584,9 @@ public class NodeStatus extends Document { if (parts.length >= 25 && !parts[24].isEmpty()) { nodeStatus.setHostName(parts[24]); } + if (parts.length >= 26) { + nodeStatus.setVersionStatus(TorVersionStatus.ofAbbreviation(parts[25])); + } return nodeStatus; } catch (NumberFormatException e) { log.error("Number format exception while parsing node " @@ -640,6 +655,8 @@ public class NodeStatus extends Document { .append((this.getVersion() != null ? this.getVersion() : "")); sb.append("\t") .append((this.getHostName() != null ? this.getHostName() : "")); + sb.append("\t").append(null != this.getVersionStatus() + ? this.getVersionStatus().getAbbreviation() : ""); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index e2bdf82..fcf3c8f 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -339,6 +339,8 @@ public class ResponseBuilder { detailsDocument.getUnreachableOrAddresses()); } else if (field.equals("version")) { dd.setVersion(detailsDocument.getVersion()); + } else if (field.equals("version_status")) { + dd.setVersionStatus(detailsDocument.getVersionStatus()); } } /* Don't escape HTML characters, like < and >, contained in diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 4fdf98b..b8bd4f6 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -22,10 +22,8 @@ import org.slf4j.LoggerFactory; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; @@ -89,7 +87,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, private SortedMap<String, Integer> lastBandwidthWeights = null; - private Set<String> lastRecommendedServerVersions = null; + private SortedSet<TorVersion> lastRecommendedServerVersions = null; private int relayConsensusesProcessed = 0; @@ -306,8 +304,15 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.relayConsensusesProcessed++; if (this.relaysLastValidAfterMillis == validAfterMillis) { this.lastBandwidthWeights = consensus.getBandwidthWeights(); - this.lastRecommendedServerVersions - = new HashSet<>(consensus.getRecommendedServerVersions()); + this.lastRecommendedServerVersions = new TreeSet<>(); + for (String recommendedServerVersion : + consensus.getRecommendedServerVersions()) { + TorVersion recommendedTorServerVersion + = TorVersion.of(recommendedServerVersion); + if (null != recommendedTorServerVersion) { + this.lastRecommendedServerVersions.add(recommendedTorServerVersion); + } + } } } @@ -798,8 +803,13 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, * the recommended_version field accordingly. */ if (null != this.lastRecommendedServerVersions && null != nodeStatus.getVersion()) { + TorVersion torVersion = TorVersion.of(nodeStatus.getVersion()); nodeStatus.setRecommendedVersion(this.lastRecommendedServerVersions - .contains(nodeStatus.getVersion())); + .contains(torVersion)); + nodeStatus.setVersionStatus(null != torVersion + ? torVersion.determineVersionStatus( + this.lastRecommendedServerVersions) + : TorVersionStatus.UNRECOMMENDED); } Map<String, Long> exitAddresses = new HashMap<>(); @@ -909,6 +919,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setLastChangedOrAddressOrPort( nodeStatus.getLastChangedOrAddressOrPort()); detailsStatus.setVersion(nodeStatus.getVersion()); + detailsStatus.setVersionStatus(nodeStatus.getVersionStatus().toString()); this.documentStore.store(detailsStatus, fingerprint); this.documentStore.store(nodeStatus, fingerprint); diff --git a/src/main/java/org/torproject/onionoo/updater/TorVersion.java b/src/main/java/org/torproject/onionoo/updater/TorVersion.java new file mode 100644 index 0000000..d8e1683 --- /dev/null +++ b/src/main/java/org/torproject/onionoo/updater/TorVersion.java @@ -0,0 +1,150 @@ +/* Copyright 2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo.updater; + +import java.util.HashMap; +import java.util.Map; +import java.util.SortedSet; + +/** + * Helper class to compare Tor versions. + * + * <p>Based on "How Tor Version Numbers Work", available at + * https://gitweb.torproject.org/torspec.git/tree/version-spec.txt</p> + */ +public class TorVersion implements Comparable<TorVersion> { + + private int majorVersion; + + private int minorVersion; + + private int microVersion; + + private String releaseSeries; + + private Integer patchLevel = null; + + private String statusTag = null; + + private static Map<String, TorVersion> knownVersions = new HashMap<>(); + + private TorVersion() { + } + + /** Return a TorVersion instance from the given tor version string that can be + * compared to other tor version strings, or null if the given string is not a + * valid tor version. */ + public static TorVersion of(String versionString) { + if (null == versionString) { + return null; + } + if (!knownVersions.containsKey(versionString)) { + TorVersion result = new TorVersion(); + String[] components = versionString.split("-")[0].split("\\."); + try { + result.majorVersion = Integer.parseInt(components[0]); + result.minorVersion = Integer.parseInt(components[1]); + result.microVersion = Integer.parseInt(components[2]); + result.releaseSeries = String.format("%d.%d.%d", + result.majorVersion, result.minorVersion, result.microVersion); + if (components.length == 4) { + result.patchLevel = Integer.parseInt(components[3]); + if (versionString.contains("-")) { + result.statusTag = versionString.split("-", 2)[1].split(" ")[0]; + } + } + } catch (ArrayIndexOutOfBoundsException + | NumberFormatException exception) { + result = null; + } + knownVersions.put(versionString, result); + } + return knownVersions.get(versionString); + } + + @Override + public int compareTo(TorVersion other) { + if (null == other) { + throw new NullPointerException(); + } + int result; + if ((result = Integer.compare(this.majorVersion, + other.majorVersion)) != 0) { + return result; + } + if ((result = Integer.compare(this.minorVersion, + other.minorVersion)) != 0) { + return result; + } + if ((result = Integer.compare(this.microVersion, + other.microVersion)) != 0) { + return result; + } + if (null == this.patchLevel && null == other.patchLevel) { + return 0; + } else if (null == patchLevel) { + return -1; + } else if (null == other.patchLevel) { + return 1; + } else if ((result = Integer.compare(this.patchLevel, + other.patchLevel)) != 0) { + return result; + } + if (null == this.statusTag && null == other.statusTag) { + return 0; + } else if (null == this.statusTag) { + return -1; + } else if (null == other.statusTag) { + return 1; + } else { + return this.statusTag.compareTo(other.statusTag); + } + } + + @Override + public boolean equals(Object other) { + return null != other && other instanceof TorVersion + && this.compareTo((TorVersion) other) == 0; + } + + @Override + public int hashCode() { + return 2 * Integer.hashCode(this.majorVersion) + + 3 * Integer.hashCode(this.minorVersion) + + 5 * Integer.hashCode(this.microVersion) + + 7 * (null == this.patchLevel ? 0 : this.patchLevel) + + 11 * (null == this.statusTag ? 0 : this.statusTag.hashCode()); + } + + /** Determine the version status of this tor version in the context of the + * given recommended tor versions. */ + public TorVersionStatus determineVersionStatus( + SortedSet<TorVersion> recommendedVersions) { + if (recommendedVersions.contains(this)) { + return TorVersionStatus.RECOMMENDED; + } else if (this.compareTo(recommendedVersions.last()) > 0) { + return TorVersionStatus.EXPERIMENTAL; + } else if (this.compareTo(recommendedVersions.first()) < 0) { + return TorVersionStatus.OBSOLETE; + } else { + boolean seriesHasRecommendedVersions = false; + boolean notNewInSeries = false; + for (TorVersion recommendedVersion : recommendedVersions) { + if (this.releaseSeries.equals( + recommendedVersion.releaseSeries)) { + seriesHasRecommendedVersions = true; + if (this.compareTo(recommendedVersion) < 0) { + notNewInSeries = true; + } + } + } + if (seriesHasRecommendedVersions && !notNewInSeries) { + return TorVersionStatus.NEW_IN_SERIES; + } else { + return TorVersionStatus.UNRECOMMENDED; + } + } + } +} + diff --git a/src/main/java/org/torproject/onionoo/updater/TorVersionStatus.java b/src/main/java/org/torproject/onionoo/updater/TorVersionStatus.java new file mode 100644 index 0000000..5825064 --- /dev/null +++ b/src/main/java/org/torproject/onionoo/updater/TorVersionStatus.java @@ -0,0 +1,47 @@ +/* Copyright 2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo.updater; + +import java.util.HashMap; +import java.util.Map; + +public enum TorVersionStatus { + + RECOMMENDED("recommended", "r"), + EXPERIMENTAL("experimental", "e"), + OBSOLETE("obsolete", "o"), + NEW_IN_SERIES("new in series", "n"), + UNRECOMMENDED("unrecommended", "u"); + + private final String statusString; + + private final String abbreviation; + + TorVersionStatus(String statusString, String abbreviation) { + this.statusString = statusString; + this.abbreviation = abbreviation; + } + + public String getAbbreviation() { + return this.abbreviation; + } + + private static Map<String, TorVersionStatus> byAbbreviation = new HashMap<>(); + + static { + for (TorVersionStatus status : TorVersionStatus.values()) { + byAbbreviation.put(status.abbreviation, status); + } + } + + public static TorVersionStatus ofAbbreviation(String abbrevation) { + return byAbbreviation.get(abbrevation); + } + + @Override + public String toString() { + return this.statusString; + } +} + diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 8490f05..eca7874 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -162,6 +162,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setUnreachableOrAddresses(unreachableOrAddresses); } detailsDocument.setVersion(detailsStatus.getVersion()); + detailsDocument.setVersionStatus(detailsStatus.getVersionStatus()); this.documentStore.store(detailsDocument, fingerprint); } diff --git a/src/test/java/org/torproject/onionoo/updater/TorVersionTest.java b/src/test/java/org/torproject/onionoo/updater/TorVersionTest.java new file mode 100644 index 0000000..b6a9764 --- /dev/null +++ b/src/test/java/org/torproject/onionoo/updater/TorVersionTest.java @@ -0,0 +1,127 @@ +/* Copyright 2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo.updater; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import org.junit.experimental.runners.Enclosed; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +import java.util.Arrays; +import java.util.Collection; +import java.util.SortedSet; +import java.util.TreeSet; + +(a)RunWith(Enclosed.class) +public class TorVersionTest { + + @RunWith(Parameterized.class) + public static class TorVersionStatusTest { + + private static String[] recommendedVersionStrings = new String[] { + "0.2.5.16", "0.2.5.17", "0.2.9.14", "0.2.9.15", "0.3.1.9", "0.3.1.10", + "0.3.2.8-rc", "0.3.2.9", "0.3.3.1-alpha", "0.3.3.2-alpha" }; + + /** Provide test data. */ + @Parameters + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] { + { "Recommended version", "0.2.5.16", "recommended" }, + { "Recommended version", "0.3.2.8-rc", "recommended" }, + { "Recommended version", "0.3.3.2-alpha", "recommended" }, + { "Experimental version", "0.3.3.2-alpha-dev", "experimental" }, + { "Experimental version", "0.3.3.3-alpha", "experimental" }, + { "Experimental version", "0.3.4.0-alpha-dev", "experimental" }, + { "Obsolete version", "0.2.5.15", "obsolete" }, + { "Obsolete version", "0.1.0.1-rc", "obsolete" }, + { "New-in-series version", "0.2.5.18", "new in series" }, + { "New-in-series version", "0.3.2.9-dev", "new in series" }, + { "New-in-series version", "0.3.2.10", "new in series" }, + { "Unrecommended version", "0.2.9.13", "unrecommended" }, + { "Unrecommended version", "0.3.1.8-dev", "unrecommended" }, + { "Unrecommended version", "0.3.3.0-alpha-dev", "unrecommended" }, + { "Unrecognized (experimental) version", "1.0-final", + "unrecommended" }, + { "Unrecognized (obsolete) version", "0.0.2pre13", "unrecommended" } + }); + } + + @Parameter + public String testDescription; + + @Parameter(1) + public String versionString; + + @Parameter(2) + public String expectedVersionStatus; + + @Test + public void test() { + SortedSet<TorVersion> recommendedTorVersions = new TreeSet<>(); + for (String recommendedVersionString : recommendedVersionStrings) { + recommendedTorVersions.add(TorVersion.of(recommendedVersionString)); + } + TorVersion torVersion = TorVersion.of(this.versionString); + String determinedVersionStatus = "unrecommended"; + if (null != torVersion) { + determinedVersionStatus = torVersion + .determineVersionStatus(recommendedTorVersions).toString(); + } + assertEquals(this.testDescription, this.expectedVersionStatus, + determinedVersionStatus); + } + } + + @RunWith(Parameterized.class) + public static class TorVersionEqualsHashCodeCompareToTest { + + /** Provide test data. */ + @Parameters + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] { + { "0.2.5.16", "0.2.5.16", true, true, 0 }, + { "0.2.5.16", "0.2.5.17", false, false, -1 }, + { "0.3.3.1-alpha", "0.3.3.1-alpha", true, true, 0 }, + { "0.1.2.3", "00.01.02.03", true, true, 0 }, + { "0.1.2.3-alpha", "00.01.02.03-aallpphhaa", false, false, 1 } + }); + } + + @Parameter + public String firstVersionString; + + @Parameter(1) + public String secondVersionString; + + @Parameter(2) + public boolean expectedEqualsResult; + + @Parameter(3) + public boolean expectedSameHashCodes; + + @Parameter(4) + public int expectedCompareToResult; + + @Test + public void test() { + TorVersion firstVersion = TorVersion.of(this.firstVersionString); + TorVersion secondVersion = TorVersion.of(this.secondVersionString); + assertEquals(this.expectedEqualsResult, + firstVersion.equals(secondVersion)); + if (this.expectedSameHashCodes) { + assertEquals(firstVersion.hashCode(), secondVersion.hashCode()); + } + int actualCompareToResult = firstVersion.compareTo(secondVersion); + assertTrue(this.expectedCompareToResult < 0 && actualCompareToResult < 0 + || this.expectedCompareToResult == 0 && actualCompareToResult == 0 + || this.expectedCompareToResult > 0 && actualCompareToResult > 0); + } + } +} +

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit 13127bdfafd9b48f03a5c3553f16a2c8686bd106 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 16:45:41 2018 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 033f37518..7b24184ac 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -2,34 +2,36 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Versleutel het web! Gebruik HTTPS-beveiliging automatisch op vele sites."> <!ENTITY https-everywhere.about.version "Versie"> -<!ENTITY https-everywhere.about.add_new_rule "Voeg nieuwe regel toe"> +<!ENTITY https-everywhere.about.rulesets_version "Regelsetsversie voor"> +<!ENTITY https-everywhere.about.add_new_rule "Nieuwe regel toevoegen"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Doneer aan EFF"> <!ENTITY https-everywhere.menu.observatory "SSL-observatoriumvoorkeuren"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere inschakelen"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blokkeer alle onversleutelde verzoeken"> -<!ENTITY https-everywhere.menu.showCounter "Toon Teller"> -<!ENTITY https-everywhere.menu.viewAllRules "Toon Alle Regels"> +<!ENTITY https-everywhere.menu.showCounter "Teller weergeven"> +<!ENTITY https-everywhere.menu.viewAllRules "Alle regels bekijken"> -<!ENTITY https-everywhere.options.generalSettings "Algemene Instellingen"> +<!ENTITY https-everywhere.options.generalSettings "Algemene instellingen"> <!ENTITY https-everywhere.options.importSettings "Instellingen importeren"> <!ENTITY https-everywhere.options.import "Importeren"> -<!ENTITY https-everywhere.options.imported "De instellingen zijn geÏmporteerd"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Regelsets automatisch bijwerken"> +<!ENTITY https-everywhere.options.imported "Uw instellingen zijn geïmporteerd."> <!ENTITY https-everywhere.prefs.export_settings "Instellingen exporteren"> <!ENTITY https-everywhere.prefs.reset_defaults "Standaardwaarden herstellen"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Forceer versleutelde connecties naar deze websites:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Dwing versleutelde verbindingen met deze websites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentele regels"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan schade aanrichten of waarschuwingen tonen. Standaard is deze uitgeschakeld."> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan schade aanrichten of waarschuwingen tonen. Standaard is dit uitgeschakeld."> <!ENTITY https-everywhere.chrome.add_rule "Voeg een regel toe voor deze site"> <!ENTITY https-everywhere.chrome.add_new_rule "Voeg een nieuwe regel toe voor deze site"> <!ENTITY https-everywhere.chrome.always_https_for_host "Gebruik altijd https voor deze host"> <!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Toon geavanceerd"> +<!ENTITY https-everywhere.chrome.show_advanced "Geavanceerd weergeven"> <!ENTITY https-everywhere.chrome.hide_advanced "Geavanceerd verbergen"> -<!ENTITY https-everywhere.chrome.rule_name "Regel naam"> -<!ENTITY https-everywhere.chrome.regex "Matchende regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Verwijs naar"> +<!ENTITY https-everywhere.chrome.rule_name "Regelnaam"> +<!ENTITY https-everywhere.chrome.regex "Overeenkomende regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Doorverwijzen naar"> <!ENTITY https-everywhere.chrome.status_cancel_button "Annuleren">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit f55b5664c77e78a0512ac8a6f0ce2cb298b723d8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 16:45:31 2018 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 54c7b92df..7b24184ac 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -2,36 +2,36 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Versleutel het web! Gebruik HTTPS-beveiliging automatisch op vele sites."> <!ENTITY https-everywhere.about.version "Versie"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for "> -<!ENTITY https-everywhere.about.add_new_rule "Voeg nieuwe regel toe"> +<!ENTITY https-everywhere.about.rulesets_version "Regelsetsversie voor"> +<!ENTITY https-everywhere.about.add_new_rule "Nieuwe regel toevoegen"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Doneer aan EFF"> <!ENTITY https-everywhere.menu.observatory "SSL-observatoriumvoorkeuren"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere inschakelen"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blokkeer alle onversleutelde verzoeken"> -<!ENTITY https-everywhere.menu.showCounter "Toon Teller"> -<!ENTITY https-everywhere.menu.viewAllRules "Toon Alle Regels"> +<!ENTITY https-everywhere.menu.showCounter "Teller weergeven"> +<!ENTITY https-everywhere.menu.viewAllRules "Alle regels bekijken"> -<!ENTITY https-everywhere.options.generalSettings "Algemene Instellingen"> +<!ENTITY https-everywhere.options.generalSettings "Algemene instellingen"> <!ENTITY https-everywhere.options.importSettings "Instellingen importeren"> <!ENTITY https-everywhere.options.import "Importeren"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> -<!ENTITY https-everywhere.options.imported "De instellingen zijn geÏmporteerd"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Regelsets automatisch bijwerken"> +<!ENTITY https-everywhere.options.imported "Uw instellingen zijn geïmporteerd."> <!ENTITY https-everywhere.prefs.export_settings "Instellingen exporteren"> <!ENTITY https-everywhere.prefs.reset_defaults "Standaardwaarden herstellen"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Forceer versleutelde connecties naar deze websites:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Dwing versleutelde verbindingen met deze websites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentele regels"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan schade aanrichten of waarschuwingen tonen. Standaard is deze uitgeschakeld."> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan schade aanrichten of waarschuwingen tonen. Standaard is dit uitgeschakeld."> <!ENTITY https-everywhere.chrome.add_rule "Voeg een regel toe voor deze site"> <!ENTITY https-everywhere.chrome.add_new_rule "Voeg een nieuwe regel toe voor deze site"> <!ENTITY https-everywhere.chrome.always_https_for_host "Gebruik altijd https voor deze host"> <!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Toon geavanceerd"> +<!ENTITY https-everywhere.chrome.show_advanced "Geavanceerd weergeven"> <!ENTITY https-everywhere.chrome.hide_advanced "Geavanceerd verbergen"> -<!ENTITY https-everywhere.chrome.rule_name "Regel naam"> -<!ENTITY https-everywhere.chrome.regex "Matchende regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Verwijs naar"> +<!ENTITY https-everywhere.chrome.rule_name "Regelnaam"> +<!ENTITY https-everywhere.chrome.regex "Overeenkomende regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Doorverwijzen naar"> <!ENTITY https-everywhere.chrome.status_cancel_button "Annuleren">

1 0

[tor-browser-build/master] Bug 25710: Extract from $rootdir in mingw-w64's setup.
by boklm＠torproject.org 04 Apr '18

04 Apr '18

commit 5ebf06b020bb3358a1bfeea5c8ff48fd70939308 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 00:15:14 2018 -0700 Bug 25710: Extract from $rootdir in mingw-w64's setup. This makes it consistent with the setup of gcc and macosx-toolchain. --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 73961e4..5bfc93f 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -14,7 +14,7 @@ var: setup: | [% c("var/setarch") -%] mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH" export gcclibs=/var/tmp/dist/mingw-w64/gcclibs targets:

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit 16e3f977683d542088bb7f4f651c43f31e33e096 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 15:20:20 2018 +0000 Update translations for tor-browser-manual_completed --- pt/pt.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 9bb190563..87ede39e6 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -2,8 +2,8 @@ # Manuela Silva <manuela.silva(a)sky.com>, 2016 # Rui Neves <ninjadesaiote(a)gmail.com>, 2016 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2016 -# Francisco P. <sonhosdigitais(a)gmx.com>, 2016 # Koh Pyreit <inactive+kohpyreit(a)transifex.com>, 2016 +# Francisco P. <sonhosdigitais(a)gmx.com>, 2016 # Cesar Silva <cesarsilvabx(a)gmail.com>, 2017 # Alberto Castro, 2017 msgid "" @@ -85,7 +85,7 @@ msgstr "" #: about-tor-browser.page:50 msgid "How Tor works" -msgstr "Funcionamento do Tor" +msgstr "Como o Tor funciona" #: about-tor-browser.page:52 msgid "" @@ -163,7 +163,7 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "A obter os endereços de ponte" +msgstr "Obter endereços de ponte" #: bridges.page:29 msgid "" @@ -193,15 +193,15 @@ msgstr "" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "Introduzindo endereços de ponte" +msgstr "Introduzir endereços de ponte" #: bridges.page:52 msgid "" "Once you have obtained some bridge addresses, you will need to enter them " "into Tor Launcher." msgstr "" -"Uma vez que você tenha obtido alguns endereços da ponte, irá necessitar de " -"introduzi-los no Lançador do Tor." +"Assim que tiver obtido alguns endereços de ponte, terá de introduzi-los no " +"Tor Launcher." #: bridges.page:57 msgid "" @@ -264,7 +264,7 @@ msgstr "" #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "A utilizar transportes ligáveis" +msgstr "Utilizar transportes ligáveis" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit 026162d1a1351d9adc824af8b3a85652955417e6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 15:20:14 2018 +0000 Update translations for tor-browser-manual --- pt/pt.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 9bb190563..87ede39e6 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -2,8 +2,8 @@ # Manuela Silva <manuela.silva(a)sky.com>, 2016 # Rui Neves <ninjadesaiote(a)gmail.com>, 2016 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2016 -# Francisco P. <sonhosdigitais(a)gmx.com>, 2016 # Koh Pyreit <inactive+kohpyreit(a)transifex.com>, 2016 +# Francisco P. <sonhosdigitais(a)gmx.com>, 2016 # Cesar Silva <cesarsilvabx(a)gmail.com>, 2017 # Alberto Castro, 2017 msgid "" @@ -85,7 +85,7 @@ msgstr "" #: about-tor-browser.page:50 msgid "How Tor works" -msgstr "Funcionamento do Tor" +msgstr "Como o Tor funciona" #: about-tor-browser.page:52 msgid "" @@ -163,7 +163,7 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "A obter os endereços de ponte" +msgstr "Obter endereços de ponte" #: bridges.page:29 msgid "" @@ -193,15 +193,15 @@ msgstr "" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "Introduzindo endereços de ponte" +msgstr "Introduzir endereços de ponte" #: bridges.page:52 msgid "" "Once you have obtained some bridge addresses, you will need to enter them " "into Tor Launcher." msgstr "" -"Uma vez que você tenha obtido alguns endereços da ponte, irá necessitar de " -"introduzi-los no Lançador do Tor." +"Assim que tiver obtido alguns endereços de ponte, terá de introduzi-los no " +"Tor Launcher." #: bridges.page:57 msgid "" @@ -264,7 +264,7 @@ msgstr "" #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "A utilizar transportes ligáveis" +msgstr "Utilizar transportes ligáveis" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit bc758aaef13885361d5989085b3ed4a02f777fcc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 15:18:16 2018 +0000 Update translations for tor_animation_completed --- pt.srt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt.srt b/pt.srt index de913130d..7fbe513af 100644 --- a/pt.srt +++ b/pt.srt @@ -51,7 +51,7 @@ para o explorar 12 00:00:34,500 --> 00:00:37,000 -Mas não se utilizar o Tor! +Mas não, se utilizar o Tor! 13 00:00:37,140 --> 00:00:40,840 @@ -80,7 +80,7 @@ Tor também protege os nossos dados 18 00:00:58,400 --> 00:01:01,900 contra empresas ou governo, -e vigilância em massa. +e vigilância em série. 19 00:01:02,880 --> 00:01:07,340

1 0