tor-commits March 2020

tor-commits@lists.torproject.org

21 participants
1780 discussions

[community/master] Update Tor Weather details
by pili＠torproject.org 02 Mar '20

02 Mar '20

commit fdf68d8adcc81d228e01d91218c7bc7d1b3c37bf Author: Pili Guerra <pili(a)piliguerra.com> Date: Mon Mar 2 17:17:02 2020 +0100 Update Tor Weather details --- content/gsoc/tor-weather/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/gsoc/tor-weather/contents.lr b/content/gsoc/tor-weather/contents.lr index 3023237..cc6b997 100644 --- a/content/gsoc/tor-weather/contents.lr +++ b/content/gsoc/tor-weather/contents.lr @@ -39,8 +39,8 @@ If a relay disappears today, it is unlikely that anyone will notice or even send The entire Tor network would benefit from a "Tor Weather" service to notify relay and bridge operators when the state of their relays has changed. This has a number of benefits, including: - increasing the likelihood that relay operators notice problems and actually mitigate them. -- showing relay operators that someone actually cares if their relays go down or become outdated or have another problems -- giving relay operators information about best-practices, e.g not running outdated versions, fixing their DNs, etc... +- showing relay operators that someone actually cares if their relays go down or become outdated or have other problems +- giving relay operators information about best-practices, e.g not running outdated versions, fixing their DNS, etc... Right now, there is very little direct feedback given to relay operators. This can mean that operators become discouraged and stop running relays. @@ -58,7 +58,7 @@ Once a basic email notification service is implemented, these are some ideas for - Email me when my relay runs an end-of-life version of tor - Email me when my relay runs an outdated tor version - Email me when my exit relay fails to resolve hostnames (DNS failure) -- Email me when my relay looses the stable/guard/exit flag +- Email me when my relay loses the stable/guard/exit flag - Email me when my MyFamily configuration is broken - Email me when you detect issues with my relay - Email me with suggestions for configuration improvements for my relay

1 0

[community/master] Add tor-keygen to the list of projects
by pili＠torproject.org 02 Mar '20

02 Mar '20

commit 1de7797dc617c4bfe6317d6b6de50938c5017511 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Feb 6 12:35:47 2020 +0100 Add tor-keygen to the list of projects --- content/gsoc/tor-keygen/contents.lr | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/content/gsoc/tor-keygen/contents.lr b/content/gsoc/tor-keygen/contents.lr new file mode 100644 index 0000000..f32192f --- /dev/null +++ b/content/gsoc/tor-keygen/contents.lr @@ -0,0 +1,49 @@ +_model: project +--- +_template: layout.html +--- +html: two-columns-page.html +--- +active: True +--- +section: GSoC +--- +section_id: gsoc +--- +color: primary +--- +key: 12 +--- +languages: +C +Python +Golang +Rust +--- +mentors: +asn +dgoulet +--- +difficulty: medium/hard +--- +title: tor-keygen +--- +subtitle: + +The scope of this project is to write an application that generates cryptographic keys for Tor relays, dirauths and onion services. +--- +body: + +# Problem + + +# Proposal + +Prerequisites: Understanding of Tor protocol and tor codebase + +# Resources + +- https://trac.torproject.org/projects/tor/ticket/18098 +- https://trac.torproject.org/projects/tor/ticket/14389 +- https://github.com/torproject/tor/blob/e34d963c4453ceac7ff378ce0044d1046198… +- Original tor-keygen repo on github: https://github.com/haxxpop/torkeygen \ No newline at end of file

1 0

[tpo/master] Update donate string in the download flow
by antonela＠torproject.org 02 Mar '20

02 Mar '20

commit 7a1dc2b447641d3eed12ce051e010b78bc8fd5a1 Author: Antonela <hola(a)antonela.me> Date: Mon Mar 2 13:23:01 2020 -0300 Update donate string in the download flow asked by sstevenson on Feb 26th --- content/thank-you/contents.lr | 1 - templates/thank-you.html | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/content/thank-you/contents.lr b/content/thank-you/contents.lr index c0e4058..6360e6d 100644 --- a/content/thank-you/contents.lr +++ b/content/thank-you/contents.lr @@ -15,4 +15,3 @@ body: You're equipped to browse freely. Tor is the strongest tool for privacy and freedom online. It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. -We need your help to keep Tor secure and safe for millions across the globe. [Donate Now](https://donate.torproject.org/) diff --git a/templates/thank-you.html b/templates/thank-you.html index aea0dc8..56d0835 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -1,5 +1,9 @@ -<div class="container py-3"> - <div class="row border-bottom border-light"><p></p></div> +<div class="container"> + <div class="row border-bottom border-light"> + <div class="badge content bg-warning p-3 mb-5 mx-auto text-lowercase"> + {{ _('We need your help to keep Tor secure and safe for millions across the globe.') }} + <a href="/donate">{{ _('Donate Now') }}</a> + </div> </div> <div class="container py-3"> <div class="row p-3"> @@ -9,15 +13,15 @@ <div class="container"> <div class="row"> <div class="col-md-4"> - <i class="text-primary pr-2 fas fa-paper-plane-png"></i> + <i class="h3 py-3 fas fa-paper-plane-png"></i> <h4><a href="https://newsletter.torproject.org">{{ _('Sign up for Tor News and get updates and opportunities from across the organization and community.') }}</a></h4> </div> <div class="col-md-4"> - <i class="text-primary pr-2 fas fa-cube-png"></i> + <i class="h3 py-3 fas fa-cube-png"></i> <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> - <i class="text-primary pr-2 fas fa-hands-helping-png"></i> + <i class="h3 py-3 fas fa-hands-helping-png"></i> <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div>

1 0

[metrics-lib/master] Parse recently added lines.
by karsten＠torproject.org 02 Mar '20

02 Mar '20

commit 81570c4dbc097089f367c104c7ef5a77bee29763 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 26 21:31:08 2020 +0100 Parse recently added lines. - Compute bandwidth file digests. - Parse bandwidth file header and bandwidth file digest in votes. - Parse bridge distribution requests in bridge server descriptors. - Parse authority fingerprint in bridge network statuses. Implements #33206. --- CHANGELOG.md | 8 ++++- .../org/torproject/descriptor/BandwidthFile.java | 9 +++++ .../torproject/descriptor/BridgeNetworkStatus.java | 8 +++++ .../descriptor/RelayNetworkStatusVote.java | 20 +++++++++++ .../torproject/descriptor/ServerDescriptor.java | 8 +++++ .../descriptor/impl/BandwidthFileImpl.java | 6 ++++ .../descriptor/impl/BridgeNetworkStatusImpl.java | 26 ++++++++++++++ .../torproject/descriptor/impl/DescriptorImpl.java | 9 ++++- .../java/org/torproject/descriptor/impl/Key.java | 3 ++ .../impl/RelayNetworkStatusVoteImpl.java | 41 +++++++++++++++++++++- .../descriptor/impl/ServerDescriptorImpl.java | 20 ++++++++++- .../descriptor/impl/BridgeNetworkStatusTest.java | 31 ++++++++++++++++ .../descriptor/impl/ServerDescriptorImplTest.java | 30 ++++++++++++++++ 13 files changed, 215 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d58e92b..068c0b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# Changes in version 2.1?.? - 2020-0?-?? +# Changes in version 2.11.0 - 2020-0?-?? + + * Medium changes + - Compute bandwidth file digests. + - Parse bandwidth file header and bandwidth file digest in votes. + - Parse bridge distribution requests in bridge server descriptors. + - Parse authority fingerprint in bridge network statuses. * Minor changes - Avoid invoking overridable methods from constructors. diff --git a/src/main/java/org/torproject/descriptor/BandwidthFile.java b/src/main/java/org/torproject/descriptor/BandwidthFile.java index bbc4056..25d738e 100644 --- a/src/main/java/org/torproject/descriptor/BandwidthFile.java +++ b/src/main/java/org/torproject/descriptor/BandwidthFile.java @@ -18,6 +18,15 @@ import java.util.Optional; public interface BandwidthFile extends Descriptor { /** + * Return the SHA-256 bandwidth file digest, encoded as 43 base64 characters + * without padding characters, that is used to reference this bandwidth file + * from a vote. + * + * @since 2.11.0 + */ + String digestSha256Base64(); + + /** * Time of the most recent generator bandwidth result. * * @since 2.6.0 diff --git a/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java b/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java index 9c78b77..6ae4751 100644 --- a/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java +++ b/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java @@ -117,6 +117,14 @@ public interface BridgeNetworkStatus extends Descriptor { int getIgnoringAdvertisedBws(); /** + * Return a SHA-1 digest of the bridge authority's identity key, encoded as 40 + * upper-case hexadecimal characters. + * + * @since 2.11.0 + */ + String getFingerprint(); + + /** * Return status entries for each contained bridge, with map keys being * SHA-1 digests of SHA-1 digest of the bridges' public identity keys, * encoded as 40 upper-case hexadecimal characters. diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java index 5ed31b3..a447a7a 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -361,6 +361,26 @@ public interface RelayNetworkStatusVote extends Descriptor { String getSharedRandCurrentValue(); /** + * Return the headers from the bandwidth file used to generate this vote, or + * null if the authority producing this vote is not configured with a + * bandwidth file or does not include the headers of the configured bandwidth + * file in its vote. + * + * @since 2.11.0 + */ + SortedMap<String, String> getBandwidthFileHeaders(); + + /** + * Return the SHA256 digest of the bandwidth file, encoded as 43 base64 + * characters without padding characters, or null if the authority producing + * this vote is not configured with a bandwidth file or does not include the + * SHA256 digest of the configured bandwidth file in its vote. + * + * @since 2.11.0 + */ + String getBandwidthFileDigestSha256Base64(); + + /** * Return the version of the directory key certificate used by this * authority, which must be 3 or higher. * diff --git a/src/main/java/org/torproject/descriptor/ServerDescriptor.java b/src/main/java/org/torproject/descriptor/ServerDescriptor.java index 2e0ecbd..ed585b0 100644 --- a/src/main/java/org/torproject/descriptor/ServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ServerDescriptor.java @@ -245,6 +245,14 @@ public interface ServerDescriptor extends Descriptor { String getContact(); /** + * Return the method how a bridge requests to be distributed by BridgeDB, or + * {@code null} if no such request is contained in the descriptor. + * + * @since 2.11.0 + */ + String getBridgeDistributionRequest(); + + /** * Return nicknames, $-prefixed identity fingerprints, or tuples of the * format {@code $fingerprint=nickname} or {@code $fingerprint~nickname} * of servers contained in this server's family, or null if the diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java index f9198a4..94df839 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java @@ -66,6 +66,7 @@ public class BandwidthFileImpl extends DescriptorImpl implements BandwidthFile { this.parseRelayLine(line); } } + this.calculateDigestSha256Base64(); } private void parseTimestampLine(String line) throws DescriptorParseException { @@ -257,6 +258,11 @@ public class BandwidthFileImpl extends DescriptorImpl implements BandwidthFile { additionalKeyValues.isEmpty() ? null : additionalKeyValues)); } + @Override + public String digestSha256Base64() { + return this.getDigestSha256Base64(); + } + private LocalDateTime timestamp; @Override diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index b9241a8..68b954f 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -10,8 +10,10 @@ import java.io.File; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.EnumSet; import java.util.Map; import java.util.Scanner; +import java.util.Set; import java.util.SortedMap; import java.util.TimeZone; @@ -24,6 +26,10 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl throws DescriptorParseException { super(rawDescriptorBytes, offsetAndLength, descriptorFile, false); this.splitAndParseParts(false); + Set<Key> atMostOnceKeys = EnumSet.of(Key.PUBLISHED, Key.FLAG_THRESHOLDS, + Key.FINGERPRINT); + this.checkAtMostOnceKeys(atMostOnceKeys); + this.clearParsedKeys(); this.setPublishedMillisFromFileName(fileName); } @@ -85,6 +91,9 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl case FLAG_THRESHOLDS: this.parseFlagThresholdsLine(line, parts); break; + case FINGERPRINT: + this.parseFingerprintLine(line, parts); + break; default: if (this.unrecognizedLines == null) { this.unrecognizedLines = new ArrayList<>(); @@ -151,6 +160,16 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl } } + private void parseFingerprintLine(String line, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length < 2) { + throw new DescriptorParseException("Illegal line '" + line + + "' in bridge network status."); + } + this.fingerprint = ParseHelper.parseTwentyByteHexString(line, + partsNoOpt[1]); + } + protected void parseDirSource(int offset, int length) throws DescriptorParseException { throw new DescriptorParseException("No directory source expected in " @@ -238,5 +257,12 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl public int getIgnoringAdvertisedBws() { return this.ignoringAdvertisedBws; } + + private String fingerprint; + + @Override + public String getFingerprint() { + return this.fingerprint; + } } diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 4b380bc..f963a53 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -408,7 +408,10 @@ public abstract class DescriptorImpl implements Descriptor { if (null == this.digestSha256Base64) { String ascii = new String(this.rawDescriptorBytes, this.offset, this.length, StandardCharsets.US_ASCII); - int start = ascii.indexOf(startToken); + int start = 0; + if (null != startToken) { + start = ascii.indexOf(startToken); + } int end = -1; if (null == endToken) { end = ascii.length(); @@ -431,6 +434,10 @@ public abstract class DescriptorImpl implements Descriptor { this.calculateDigestSha256Base64(startToken, null); } + protected void calculateDigestSha256Base64() throws DescriptorParseException { + this.calculateDigestSha256Base64(null, null); + } + public String getDigestSha256Base64() { return this.digestSha256Base64; } diff --git a/src/main/java/org/torproject/descriptor/impl/Key.java b/src/main/java/org/torproject/descriptor/impl/Key.java index 10839dd..a6202e4 100644 --- a/src/main/java/org/torproject/descriptor/impl/Key.java +++ b/src/main/java/org/torproject/descriptor/impl/Key.java @@ -17,10 +17,13 @@ public enum Key { ACCEPT("accept"), ALLOW_SINGLE_HOP_EXITS("allow-single-hop-exits"), BANDWIDTH("bandwidth"), + BANDWIDTH_FILE_DIGEST("bandwidth-file-digest"), + BANDWIDTH_FILE_HEADERS("bandwidth-file-headers"), BANDWIDTH_WEIGHTS("bandwidth-weights"), BRIDGEDB_METRICS_END("bridgedb-metrics-end"), BRIDGEDB_METRICS_VERSION("bridgedb-metrics-version"), BRIDGEDB_METRIC_COUNT("bridgedb-metric-count"), + BRIDGE_DISTRIBUTION_REQUEST("bridge-distribution-request"), BRIDGE_IPS("bridge-ips"), BRIDGE_IP_TRANSPORTS("bridge-ip-transports"), BRIDGE_IP_VERSIONS("bridge-ip-versions"), diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 7e8d816..e3fab9e 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -41,7 +41,8 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl Key.REQUIRED_CLIENT_PROTOCOLS, Key.REQUIRED_RELAY_PROTOCOLS, Key.FLAG_THRESHOLDS, Key.PARAMS, Key.CONTACT, Key.SHARED_RAND_PARTICIPATE, Key.SHARED_RAND_PREVIOUS_VALUE, - Key.SHARED_RAND_CURRENT_VALUE, Key.LEGACY_KEY, Key.DIR_KEY_CROSSCERT, + Key.SHARED_RAND_CURRENT_VALUE, Key.BANDWIDTH_FILE_HEADERS, + Key.BANDWIDTH_FILE_DIGEST, Key.LEGACY_KEY, Key.DIR_KEY_CROSSCERT, Key.DIR_ADDRESS, Key.DIRECTORY_FOOTER); this.checkAtMostOnceKeys(atMostOnceKeys); this.checkAtLeastOnceKeys(EnumSet.of(Key.DIRECTORY_SIGNATURE)); @@ -133,6 +134,12 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl case SHARED_RAND_CURRENT_VALUE: this.parseSharedRandCurrentValueLine(line, parts); break; + case BANDWIDTH_FILE_HEADERS: + this.parseBandwidthFileHeaders(line, parts); + break; + case BANDWIDTH_FILE_DIGEST: + this.parseBandwidthFileDigest(line, parts); + break; case DIR_KEY_CERTIFICATE_VERSION: this.parseDirKeyCertificateVersionLine(line, parts); break; @@ -479,6 +486,24 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.sharedRandCurrentValue = parts[2]; } + protected void parseBandwidthFileHeaders(String line, String[] parts) + throws DescriptorParseException { + this.bandwidthFileHeaders + = ParseHelper.parseKeyValueStringPairs(line, parts, 1); + } + + protected void parseBandwidthFileDigest(String line, String[] parts) + throws DescriptorParseException { + for (int i = 1; i < parts.length; i++) { + String part = parts[i]; + if (part.startsWith("sha256=")) { + /* 7 == "sha256=".length() */ + ParseHelper.verifyThirtyTwoByteBase64String(line, part.substring(7)); + this.bandwidthFileDigestSha256Base64 = part.substring(7); + } + } + } + private void parseDirKeyCertificateVersionLine(String line, String[] parts) throws DescriptorParseException { if (parts.length != 2) { @@ -662,6 +687,20 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl return this.sharedRandCurrentValue; } + private SortedMap<String, String> bandwidthFileHeaders; + + @Override + public SortedMap<String, String> getBandwidthFileHeaders() { + return this.bandwidthFileHeaders; + } + + private String bandwidthFileDigestSha256Base64; + + @Override + public String getBandwidthFileDigestSha256Base64() { + return this.bandwidthFileDigestSha256Base64; + } + private int dirKeyCertificateVersion; @Override diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index aac4bcc..261c897 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -31,7 +31,7 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl Key.IPV6_POLICY, Key.NTOR_ONION_KEY, Key.ONION_KEY_CROSSCERT, Key.NTOR_ONION_KEY_CROSSCERT, Key.TUNNELLED_DIR_SERVER, Key.ROUTER_SIG_ED25519, Key.ROUTER_SIGNATURE, Key.ROUTER_DIGEST_SHA256, - Key.ROUTER_DIGEST); + Key.ROUTER_DIGEST, Key.BRIDGE_DISTRIBUTION_REQUEST); private static final Set<Key> exactlyOnce = EnumSet.of( Key.ROUTER, Key.BANDWIDTH, Key.PUBLISHED); @@ -113,6 +113,9 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl case CONTACT: this.parseContactLine(lineNoOpt); break; + case BRIDGE_DISTRIBUTION_REQUEST: + this.parseBridgeDistributionRequestLine(line, partsNoOpt); + break; case FAMILY: this.parseFamilyLine(line, partsNoOpt); break; @@ -394,6 +397,14 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } } + private void parseBridgeDistributionRequestLine(String line, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length < 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + this.bridgeDistributionRequest = partsNoOpt[1]; + } + private void parseFamilyLine(String line, String[] partsNoOpt) throws DescriptorParseException { String[] familyEntries = new String[partsNoOpt.length - 1]; @@ -790,6 +801,13 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl return this.contact; } + private String bridgeDistributionRequest = null; + + @Override + public String getBridgeDistributionRequest() { + return this.bridgeDistributionRequest; + } + private String[] familyEntries; @Override diff --git a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java index e586650..eea15ed 100644 --- a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java @@ -9,7 +9,9 @@ import static org.junit.Assert.assertTrue; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.DescriptorParseException; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import java.util.ArrayList; import java.util.List; @@ -18,6 +20,9 @@ import java.util.List; * already tested in the consensus/vote-parsing tests. */ public class BridgeNetworkStatusTest { + @Rule + public ExpectedException thrown = ExpectedException.none(); + /* Helper class to build a bridge network status based on default data * and modifications requested by test methods. */ private static class StatusBuilder { @@ -57,6 +62,16 @@ public class BridgeNetworkStatusTest { return sb.buildStatus(); } + private String fingerprintLine + = "fingerprint BA44A889E64B93FAA2B114E02C2A279A8555C533"; + + private static BridgeNetworkStatus createWithFingerprintLine(String line) + throws DescriptorParseException { + StatusBuilder sb = new StatusBuilder(); + sb.fingerprintLine = line; + return sb.buildStatus(); + } + private List<String> statusEntries = new ArrayList<>(); private String unrecognizedHeaderLine = null; @@ -106,6 +121,9 @@ public class BridgeNetworkStatusTest { if (this.flagThresholdsLine != null) { sb.append(this.flagThresholdsLine).append("\n"); } + if (this.fingerprintLine != null) { + sb.append(this.fingerprintLine).append("\n"); + } if (this.unrecognizedHeaderLine != null) { sb.append(this.unrecognizedHeaderLine).append("\n"); } @@ -135,6 +153,8 @@ public class BridgeNetworkStatusTest { assertEquals(339000L, status.getGuardBandwidthExcludingExits()); assertEquals(1, status.getEnoughMtbfInfo()); assertEquals(0, status.getIgnoringAdvertisedBws()); + assertEquals("BA44A889E64B93FAA2B114E02C2A279A8555C533", + status.getFingerprint()); assertEquals(264, status.getStatusEntries().get( "001934C20E23E812C27592A5795B6636B7F32462").getBandwidth()); assertTrue(status.getUnrecognizedLines().isEmpty()); @@ -161,5 +181,16 @@ public class BridgeNetworkStatusTest { assertEquals(-1, status.getEnoughMtbfInfo()); assertEquals(-1, status.getIgnoringAdvertisedBws()); } + + @Test + public void testBridgeDistributionRequestGivenTwice() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage("Keyword 'fingerprint' is contained 2 times, but " + + "must be contained at most once."); + StatusBuilder.createWithFingerprintLine( + "fingerprint BA44A889E64B93FAA2B114E02C2A279A8555C533\n" + + "fingerprint BA44A889E64B93FAA2B114E02C2A279A8555C533"); + } } diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 97456d6..f5fa52d 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -338,6 +338,15 @@ public class ServerDescriptorImplTest { return db.buildDescriptor(); } + private String bridgeDistributionRequestLine = null; + + private static ServerDescriptor createWithBridgeDistributionRequestLine( + String line) throws DescriptorParseException { + DescriptorBuilder db = new DescriptorBuilder(); + db.bridgeDistributionRequestLine = line; + return db.buildDescriptor(); + } + private byte[] buildDescriptorBytes() { StringBuilder sb = new StringBuilder(); if (this.routerLine != null) { @@ -385,6 +394,9 @@ public class ServerDescriptorImplTest { if (this.contactLine != null) { sb.append(this.contactLine).append("\n"); } + if (this.bridgeDistributionRequestLine != null) { + sb.append(this.bridgeDistributionRequestLine).append("\n"); + } if (this.familyLine != null) { sb.append(this.familyLine).append("\n"); } @@ -1973,5 +1985,23 @@ public class ServerDescriptorImplTest { assertNull(descriptor.getDigestSha1Hex()); assertNull(descriptor.getDigestSha256Base64()); } + + @Test + public void testBridgeDistributionRequestMoat() + throws DescriptorParseException { + ServerDescriptor descriptor = + DescriptorBuilder.createWithBridgeDistributionRequestLine( + "bridge-distribution-request moat"); + assertEquals("moat", descriptor.getBridgeDistributionRequest()); + } + + @Test + public void testBridgeDistributionRequestEmptySpace() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage("Illegal line 'bridge-distribution-request '."); + DescriptorBuilder.createWithBridgeDistributionRequestLine( + "bridge-distribution-request "); + } }

1 0

[translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
by translation＠torproject.org 02 Mar '20

02 Mar '20

commit 4906a28bc5b52ccc535810ec6b9cb2a9fe22f586 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 14:53:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- pt-BR/torlauncher.properties | 83 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/pt-BR/torlauncher.properties b/pt-BR/torlauncher.properties index 96fa6f8ae7..a73aea9efb 100644 --- a/pt-BR/torlauncher.properties +++ b/pt-BR/torlauncher.properties @@ -1,21 +1,22 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Inicializador do Tor +# torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor fechou inesperadamente. Isso pode ser devido um erro no Tor, ou em outro programa ou por falha no hardware. Até que você conserte o problema e reinicie o Tor, o Navegador Tor não será iniciado. +# torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=O Tor fechou inesperadamente. Isso pode ser devido a um bug no Tor em si, a um outro programa no seu sistema, ou a um problema com o equipamento. O navegador Tor não poderá acessar nenhum website até que você o reinicie. Se o problema persistir, por favor envie uma cópia do seu Tor Log para a equipe responsável pela assistência. torlauncher.tor_exited2=Ao reiniciar o Tor, as abas do seu navegador não serão fechadas. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle do Tor. torlauncher.tor_failed_to_start=Falha ao iniciar Tor. -torlauncher.tor_control_failed=Falha ao receber controle do Tor. +# torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Falha ao tentar estabelecer uma conexão com a rede Tor. torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor. -torlauncher.torrc_missing=O arquivo torrc está faltando e não pôde ser criado. -torlauncher.datadir_missing=O diretório de dados Tor não existe e não pode ser criado. +# torlauncher.torrc_missing=The torrc file is missing and could not be created. +# torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +# torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. @@ -29,8 +30,8 @@ torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte. torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. -torlauncher.bridge_suffix.meek-amazon=(funciona na China) -torlauncher.bridge_suffix.meek-azure=(funciona na China) +# torlauncher.bridge_suffix.meek-amazon=(works in China) +# torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.request_a_bridge=Solicitar uma ponte... torlauncher.request_a_new_bridge=Solicitar uma nova ponte @@ -38,7 +39,7 @@ torlauncher.contacting_bridgedb=Entrando em contato com BridgeDB. Por favor, agu torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte. torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente. torlauncher.unable_to_get_bridge=Não é possível obter uma ponte do BridgeDB.\n\n$S -torlauncher.no_meek=Este navegador não está configurado para usar o 'meek', que é necessário para obter pontes. +# torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=Nenhuma ponte está disponível neste momento. Desculpe. torlauncher.connect=Conectar @@ -48,47 +49,47 @@ torlauncher.quit_win=Sair torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contactar %S -torlauncher.forAssistance2=Se você precisar de assistência, por favor visite %S +# torlauncher.forAssistance2=For assistance, visit %S -torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail. +# torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. -torlauncher.bootstrapStatus.starting=Conectando -torlauncher.bootstrapStatus.conn_pt=Conectando-se a ponte -torlauncher.bootstrapStatus.conn_done_pt=Conectado à ponte -torlauncher.bootstrapStatus.conn_proxy=Conectando-se ao proxy -torlauncher.bootstrapStatus.conn_done_proxy=Conectado ao proxy -torlauncher.bootstrapStatus.conn=Conectando a um retransmissor Tor -torlauncher.bootstrapStatus.conn_done=Conectado a um retransmissor Tor -torlauncher.bootstrapStatus.handshake=Negociando com um retransmissor Tor -torlauncher.bootstrapStatus.handshake_done=Acabou de negociar com um retransmissor Tor -torlauncher.bootstrapStatus.onehop_create=Estabelecendo uma conexão de diretório criptografado -torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede +# torlauncher.bootstrapStatus.starting=Starting +# torlauncher.bootstrapStatus.conn_pt=Connecting to bridge +# torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge +# torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy +# torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy +# torlauncher.bootstrapStatus.conn=Connecting to a Tor relay +# torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay +# torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay +# torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +# torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection +# torlauncher.bootstrapStatus.requesting_status=Retrieving network status torlauncher.bootstrapStatus.loading_status=Carregando estado da rede torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade -torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informações do retransmissor -torlauncher.bootstrapStatus.loading_descriptors=Carregando informações do retransmissor -torlauncher.bootstrapStatus.enough_dirinfo=Informações de retransmissor de carregamento finalizados -torlauncher.bootstrapStatus.ap_conn_pt=Circuitos de construção: conectando a ponte -torlauncher.bootstrapStatus.ap_conn_done_pt=Circuitos de construção: conectados à ponte -torlauncher.bootstrapStatus.ap_conn_proxy=Circuitos de construção: conectando-se ao proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuitos de construção: conectados ao proxy -torlauncher.bootstrapStatus.ap_conn=Circuitos de construção: conectando a um retransmissor Tor -torlauncher.bootstrapStatus.ap_conn_done=Circuitos de construção: conectados a um retransmissor Tor -torlauncher.bootstrapStatus.ap_handshake=Circuitos de construção: Negociando com um retransmissor Tor -torlauncher.bootstrapStatus.ap_handshake_done=Circuitos de construção: negociação finalizada com um retransmissor Tor -torlauncher.bootstrapStatus.circuit_create=Circuitos de construção: estabelecendo um circuito Tor +# torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information +# torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +# torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information +# torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge +# torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge +# torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy +# torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy +# torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay +# torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay +# torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay +# torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay +# torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit torlauncher.bootstrapStatus.done=Conectado à rede Tor! torlauncher.bootstrapWarning.done=pronto torlauncher.bootstrapWarning.connectrefused=conexão recusada -torlauncher.bootstrapWarning.misc=variados +# torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes -torlauncher.bootstrapWarning.identity=identidade conflitante +# torlauncher.bootstrapWarning.identity=identity mismatch torlauncher.bootstrapWarning.timeout=tempo limite da conexão excedido -torlauncher.bootstrapWarning.noroute=sem rota para o host +# torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=erro de leitura/gravação -torlauncher.bootstrapWarning.pt_missing=transportador plugável ausente +# torlauncher.bootstrapWarning.pt_missing=missing pluggable transport -torlauncher.nsresult.NS_ERROR_NET_RESET=A conexão com o servidor foi perdida. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Não foi possível conectar ao servidor. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Não foi possível se conectar ao proxy. +# 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.

1 0

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 02 Mar '20

02 Mar '20

commit e0d192f7834ae3ad269a3de7c8e61c83fe0bf410 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 14:53:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- pt-BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt-BR/torlauncher.properties b/pt-BR/torlauncher.properties index 38811e3429..b43ea94e6d 100644 --- a/pt-BR/torlauncher.properties +++ b/pt-BR/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor. torlauncher.torrc_missing=O arquivo torrc está faltando e não pôde ser criado. torlauncher.datadir_missing=O diretório de dados Tor não existe e não pode ser criado. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=O diretório de autenticação de onion do Tor não existe e não pôde ser criado. torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor.

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 02 Mar '20

02 Mar '20

commit 84e370308f7ddd6a55c39a4d119b524ae903274f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 14:51:59 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- pt-BR/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt-BR/torbutton.dtd b/pt-BR/torbutton.dtd index c02e836a90..83e267409c 100644 --- a/pt-BR/torbutton.dtd +++ b/pt-BR/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Prompt de autenticação do cliente do serviço onion aberto"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Lembre-se desta chave">

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 02 Mar '20

02 Mar '20

commit 8691c3fcbb1779c17d0675c22ea40aa51be74c0c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 14:51:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- pt-BR/torbutton.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pt-BR/torbutton.properties b/pt-BR/torbutton.properties index 6d2aada0e4..2a712f0e1d 100644 --- a/pt-BR/torbutton.properties +++ b/pt-BR/torbutton.properties @@ -61,6 +61,7 @@ canvas.never=Nunca a este site (recomendado) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +# onionServices.learnMore=Learn more # onionServices.clientAuthMissing=Tor onion service missing client authorization # onionServices.authPrompt.description=%S is requesting your private key. # onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ canvas.never=Nunca a este site (recomendado) # onionServices.authPrompt.doneAccessKey=d # onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) # onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +# onionServices.authPreferences.header=Onion Services Authentication +# onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +# onionServices.authPreferences.savedKeys=Saved Keys… +# onionServices.authPreferences.dialogTitle=Onion Service Keys +# onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +# onionServices.authPreferences.onionSite=Onionsite +# onionServices.authPreferences.onionKey=Key +# onionServices.authPreferences.remove=Remove +# onionServices.authPreferences.removeAll=Remove All +# onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +# onionServices.authPreferences.failedToRemoveKey=Unable to remove key

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 02 Mar '20

02 Mar '20

commit b124a3f818c5952c77f0d23c479cec7b80f47484 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 14:51:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- pt-BR/torbutton.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pt-BR/torbutton.properties b/pt-BR/torbutton.properties index 6a1d74709f..c972b62907 100644 --- a/pt-BR/torbutton.properties +++ b/pt-BR/torbutton.properties @@ -69,14 +69,14 @@ onionServices.authPrompt.done=Pronto onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Por favor, insira uma chave válida (32 caracteres_Base52 ou 64 caracteres_Base44) onionServices.authPrompt.failedToSetKey=Não foi possível configurar Tor com a sua chave -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.header=Autenticação de Serviços de Onion +onionServices.authPreferences.overview=Alguns serviços de onion exigem que você se identifique com uma chave (um tipo de senha) antes de poder acessá-los. +onionServices.authPreferences.savedKeys=Chaves salvas… +onionServices.authPreferences.dialogTitle=Chaves de serviço de onion +onionServices.authPreferences.dialogIntro=As chaves para os seguintes sites são armazenadas no seu computador onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=Chave onionServices.authPreferences.remove=Remover -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Remover tudo +onionServices.authPreferences.failedToGetKeys=Não foi possível recuperar as chaves do tor +onionServices.authPreferences.failedToRemoveKey=Não foi possível remover a chave

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 02 Mar '20

02 Mar '20

commit 3a4268223c46f97488da76e0472ad8801bbda205 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 14:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- th/LC_MESSAGES/bridgedb.po | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index cbe7a637e0..e1d5d9131b 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -4,7 +4,7 @@ # # Translators: # bact' <arthit(a)gmail.com>, 2017 -# bact' <arthit(a)gmail.com>, 2017 +# bact' <arthit(a)gmail.com>, 2017,2020 # BlackDog ForThai <myblackdog(a)tuta.io>, 2015 # DN DN <deen6(a)protonmail.com>, 2019 # Ella Rudland <atwwtkp(a)gmail.com>, 2015 @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2020-02-18 13:39-0800\n" +"PO-Revision-Date: 2020-03-02 14:20+0000\n" +"Last-Translator: bact' <arthit(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,13 +53,10 @@ msgstr "" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." msgstr "ขออภัย! มีอะไรผิดปกติเกิดขึ้นกับคำขอของคุณ" @@ -77,7 +74,7 @@ msgstr "ซอร์สโค้ด" #: bridgedb/distributors/https/templates/base.html:98 msgid "Changelog" -msgstr "สมุดบันทึกสิ่งของใหม่" +msgstr "ปูมความเปลี่ยนแปลง" #: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" @@ -209,7 +206,7 @@ msgstr "คุณส่งถี่เกินกำหนด ใจเย็ #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: ประสม COMMANDs เพือระบุตัวเลือกทันที" +msgstr "COMMAND: (ประสม COMMAND เพื่อระบุตัวเลือกหลายตัวในคราวเดียว)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -224,7 +221,7 @@ msgstr "Currently supported transport TYPEs:" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "เฮ้!, %s!" +msgstr "เฮ้ %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" @@ -242,7 +239,7 @@ msgstr "กุญแจสาธารณะ" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "อีเมลนี้ถูกระบบสร้างขึ้นด้วยสายรุ้ง ม้ายูนิคอร์น และละอองดาว\nเพื่อให้กับ %s เมื่อวันที่ %s เวลา %s." +msgstr "อีเมลนี้ถูกระบบสร้างขึ้นด้วยสายรุ้ง ยูนิคอร์น และละอองดาว\nเพื่อมอบให้ %s เมื่อวันที่ %s เวลา %s" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -280,7 +277,7 @@ msgid "" "\n" msgstr "ยิ่งกว่านั้น BridgeDB มีบริดจฺมาตรฐาน %s โดยไม่มี\nPluggable Transports %s\nที่ช่วยหลีกเลี่ยงการเซ็นเซอร์ในสถานการณ์ส่วนมาก\n\n" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr "บริดจ์คืออะไร?" @@ -314,7 +311,7 @@ msgstr "บริดจ์ไม่ทำงาน ต้องการคว #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "หาก Tor Browser ของคุณไม่สามารถเชื่อมต่อได้ กรุณาตรวจสอบที่ %s และที่ %s" #: bridgedb/strings.py:125 msgid "Here are your bridge lines:"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2020