October 2016 - tor-commits - lists.torproject.org

[tor/master] Remove duplicate code that checks for default authorities
by nickm＠torproject.org 13 Oct '16

13 Oct '16

commit 1fc3e291083493bd7517901f467a7341d5c6f650 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 13 09:16:40 2016 -0400 Remove duplicate code that checks for default authorities Patch from ericho. Fixes 18529. Simple refactoring. --- src/or/config.c | 2 +- src/or/config.h | 10 ++++++++++ src/or/router.c | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 93e753b..bef81ab 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2471,7 +2471,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, addr_string = tor_dup_ip(addr); if (tor_addr_is_internal(&myaddr, 0)) { /* make sure we're ok with publishing an internal IP */ - if (!options->DirAuthorities && !options->AlternateDirAuthority) { + if (is_default_dir_authorities(options)) { /* if they are using the default authorities, disallow internal IPs * always. */ log_fn(warn_severity, LD_CONFIG, diff --git a/src/or/config.h b/src/or/config.h index 208659a..1b40efc 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -76,6 +76,8 @@ MOCK_DECL(char *, #define get_datadir_fname_suffix(sub1, suffix) \ get_datadir_fname2_suffix((sub1), NULL, (suffix)) +inline int is_default_dir_authorities(const or_options_t *options); + int check_or_create_data_subdir(const char *subdir); int write_to_data_subdir(const char* subdir, const char* fname, const char* str, const char* descr); @@ -147,6 +149,14 @@ smartlist_t *get_options_from_transport_options_line(const char *line, const char *transport); smartlist_t *get_options_for_server_transport(const char *transport); +/* Check if we are using default authorities */ +inline int +is_default_dir_authorities(const or_options_t *options) +{ + return (!options->DirAuthorities && + !options->AlternateDirAuthority) ? 1 : 0; +} + #ifdef CONFIG_PRIVATE #define CL_PORT_NO_STREAM_OPTIONS (1u<<0) diff --git a/src/or/router.c b/src/or/router.c index b93b7c1..287bc16 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2093,8 +2093,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) tor_addr_family(&p->addr) == AF_INET6) { /* Like IPv4, if the relay is configured using the default * authorities, disallow internal IPs. Otherwise, allow them. */ - const int default_auth = (!options->DirAuthorities && - !options->AlternateDirAuthority); + const int default_auth = is_default_dir_authorities(options); if (! tor_addr_is_internal(&p->addr, 0) || ! default_auth) { ipv6_orport = p; break;

1 0

[tor/master] Tweak patch for 18529.
by nickm＠torproject.org 13 Oct '16

13 Oct '16

commit 49d7feb8a0ecf7e3bc54c5cd7e0d2a96decdf08e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 13 09:17:41 2016 -0400 Tweak patch for 18529. - function doesn't need to be inline. - rename function - Make documentation more pedantically correct - Remove needless "? 1 : 0." --- src/or/config.c | 10 +++++++++- src/or/config.h | 10 +--------- src/or/router.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index bef81ab..166f232 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2312,6 +2312,14 @@ reset_last_resolved_addr(void) last_resolved_addr = 0; } +/* Return true if <b>options</b> is using the default authorities, and false + * if any authority-related option has been overridden. */ +int +using_default_dir_authorities(const or_options_t *options) +{ + return (!options->DirAuthorities && !options->AlternateDirAuthority); +} + /** * Attempt getting our non-local (as judged by tor_addr_is_internal() * function) IP address using following techniques, listed in @@ -2471,7 +2479,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, addr_string = tor_dup_ip(addr); if (tor_addr_is_internal(&myaddr, 0)) { /* make sure we're ok with publishing an internal IP */ - if (is_default_dir_authorities(options)) { + if (using_default_dir_authorities(options)) { /* if they are using the default authorities, disallow internal IPs * always. */ log_fn(warn_severity, LD_CONFIG, diff --git a/src/or/config.h b/src/or/config.h index 1b40efc..8942932 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -76,7 +76,7 @@ MOCK_DECL(char *, #define get_datadir_fname_suffix(sub1, suffix) \ get_datadir_fname2_suffix((sub1), NULL, (suffix)) -inline int is_default_dir_authorities(const or_options_t *options); +int using_default_dir_authorities(const or_options_t *options); int check_or_create_data_subdir(const char *subdir); int write_to_data_subdir(const char* subdir, const char* fname, @@ -149,14 +149,6 @@ smartlist_t *get_options_from_transport_options_line(const char *line, const char *transport); smartlist_t *get_options_for_server_transport(const char *transport); -/* Check if we are using default authorities */ -inline int -is_default_dir_authorities(const or_options_t *options) -{ - return (!options->DirAuthorities && - !options->AlternateDirAuthority) ? 1 : 0; -} - #ifdef CONFIG_PRIVATE #define CL_PORT_NO_STREAM_OPTIONS (1u<<0) diff --git a/src/or/router.c b/src/or/router.c index 287bc16..1ac8351 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2093,7 +2093,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) tor_addr_family(&p->addr) == AF_INET6) { /* Like IPv4, if the relay is configured using the default * authorities, disallow internal IPs. Otherwise, allow them. */ - const int default_auth = is_default_dir_authorities(options); + const int default_auth = using_default_dir_authorities(options); if (! tor_addr_is_internal(&p->addr, 0) || ! default_auth) { ipv6_orport = p; break;

1 0

[collector/master] Introduced *Sources and *Origins properties to simplify data
by karsten＠torproject.org 13 Oct '16

13 Oct '16

commit 3121a2692cf76c344c70a1bf2abcaed4966495eb Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Oct 12 19:08:04 2016 +0200 Introduced *Sources and *Origins properties to simplify data source definition. Already provides properties for task-18910. --- CHANGELOG.md | 2 + .../bridgedescs/SanitizedBridgesWriter.java | 2 +- .../torproject/collector/conf/Configuration.java | 26 ++++++++++ .../java/org/torproject/collector/conf/Key.java | 16 +++--- .../org/torproject/collector/conf/SourceType.java | 11 +++++ .../collector/relaydescs/ArchiveWriter.java | 13 +++-- src/main/resources/collector.properties | 39 +++++++++------ .../bridgedescs/SanitizedBridgesWriterTest.java | 2 +- .../collector/conf/ConfigurationTest.java | 57 +++++++++++++++++----- 9 files changed, 129 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fffad5e..6e1b7eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Medium changes - Replace four properties for configuring where to write descriptors by a single 'OutPath' property. + - Introduced *Sources and *Origins properties to simplify + data source definition. # Changes in version 1.0.2 - 2016-10-07 diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index 00aa54b..79cb13c 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -100,7 +100,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { recentPathName = Paths.get(config.getPath(Key.RecentPath).toString(), BRIDGE_DESCRIPTORS).toString(); File bridgeDirectoriesDirectory = - config.getPath(Key.BridgeSnapshotsDirectory).toFile(); + config.getPath(Key.BridgeLocalOrigins).toFile(); File sanitizedBridgesDirectory = new File(outputPathName); File statsDirectory = config.getPath(Key.StatsPath).toFile(); diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index b0b76ed..b63a00c 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -15,8 +15,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.FileTime; +import java.util.EnumSet; import java.util.Observable; import java.util.Properties; +import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -251,6 +253,30 @@ public class Configuration extends Observable implements Cloneable { } /** + * Returns a {@code SourceType} as List, e.g. + * {@code sourcetypeproperty = Remote, Sync}. + */ + public Set<SourceType> getSourceTypeSet(Key key) throws ConfigurationException { + Set<SourceType> res = null; + try { + checkClass(key, SourceType[].class); + String[] interim = props.getProperty(key.name()).split(FIELDSEP); + for (int i = 0; i < interim.length; i++) { + SourceType st = SourceType.valueOf(interim[i].trim()); + if (null == res) { + res = EnumSet.of(st); + } else { + res.add(st); + } + } + return res; + } catch (RuntimeException re) { + throw new ConfigurationException("Corrupt property: " + key + + " reason: " + re.getMessage(), re); + } + } + + /** * Returns a {@code URL} property, e.g. * {@code urlProperty = https://my.url.here}. */ diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index 613dc7a..d06fe0c 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -21,6 +21,16 @@ public enum Key { OutputPath(Path.class), IndexPath(Path.class), StatsPath(Path.class), + SyncPath(Path.class), + RelaySources(SourceType[].class), + BridgeSources(SourceType[].class), + ExitlistSources(SourceType[].class), + RelayCacheOrigins(String[].class), + RelayLocalOrigins(Path.class), + RelaySyncOrigins(URL[].class), + BridgeSyncOrigins(URL[].class), + BridgeLocalOrigins(Path.class), + ExitlistSyncOrigins(URL[].class), BridgedescsActivated(Boolean.class), BridgedescsOffsetMinutes(Integer.class), BridgedescsPeriodMinutes(Integer.class), @@ -36,11 +46,7 @@ public enum Key { UpdateindexActivated(Boolean.class), UpdateindexOffsetMinutes(Integer.class), UpdateindexPeriodMinutes(Integer.class), - BridgeSnapshotsDirectory(Path.class), - CachedRelayDescriptorsDirectories(String[].class), CompressRelayDescriptorDownloads(Boolean.class), - DirectoryArchivesDirectory(Path.class), - DownloadRelayDescriptors(Boolean.class), DirectoryAuthoritiesAddresses(String[].class), DirectoryAuthoritiesFingerprintsForVotes(String[].class), DownloadCurrentConsensus(Boolean.class), @@ -51,8 +57,6 @@ public enum Key { DownloadMissingMicrodescriptors(Boolean.class), DownloadAllServerDescriptors(Boolean.class), DownloadAllExtraInfoDescriptors(Boolean.class), - ImportCachedRelayDescriptors(Boolean.class), - ImportDirectoryArchives(Boolean.class), KeepDirectoryArchiveImportHistory(Boolean.class), ReplaceIpAddressesWithHashes(Boolean.class), BridgeDescriptorMappingsLimit(Integer.class), diff --git a/src/main/java/org/torproject/collector/conf/SourceType.java b/src/main/java/org/torproject/collector/conf/SourceType.java new file mode 100644 index 0000000..b6eb7ce --- /dev/null +++ b/src/main/java/org/torproject/collector/conf/SourceType.java @@ -0,0 +1,11 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.collector.conf; + +public enum SourceType { + Cache, + Local, + Remote, + Sync; +} diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java index cac5d14..cdf6506 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -6,6 +6,7 @@ package org.torproject.collector.relaydescs; import org.torproject.collector.conf.Configuration; import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; +import org.torproject.collector.conf.SourceType; import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.DescriptorParser; @@ -146,7 +147,9 @@ public class ArchiveWriter extends CollecTorMain { RelayDescriptorParser rdp = new RelayDescriptorParser(this); RelayDescriptorDownloader rdd = null; - if (config.getBool(Key.DownloadRelayDescriptors)) { + + Set<SourceType> sources = config.getSourceTypeSet(Key.RelaySources); + if (sources.contains(SourceType.Remote)) { String[] dirSources = config.getStringArray(Key.DirectoryAuthoritiesAddresses); rdd = new RelayDescriptorDownloader(rdp, dirSources, @@ -162,15 +165,15 @@ public class ArchiveWriter extends CollecTorMain { config.getBool(Key.CompressRelayDescriptorDownloads)); rdp.setRelayDescriptorDownloader(rdd); } - if (config.getBool(Key.ImportCachedRelayDescriptors)) { + if (sources.contains(SourceType.Cache)) { new CachedRelayDescriptorReader(rdp, - config.getStringArray(Key.CachedRelayDescriptorsDirectories), statsDirectory); + config.getStringArray(Key.RelayCacheOrigins), statsDirectory); this.intermediateStats("importing relay descriptors from local " + "Tor data directories"); } - if (config.getBool(Key.ImportDirectoryArchives)) { + if (sources.contains(SourceType.Local)) { new ArchiveReader(rdp, - config.getPath(Key.DirectoryArchivesDirectory).toFile(), + config.getPath(Key.RelayLocalOrigins).toFile(), statsDirectory, config.getBool(Key.KeepDirectoryArchiveImportHistory)); this.intermediateStats("importing relay descriptors from local " diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 1c02c92..4441e1d 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -64,20 +64,22 @@ RecentPath = recent OutputPath = out # Some statistics are stored here. StatsPath = stats +# Path for descriptors downloaded from other instances +SyncPath = sync ######## Relay descriptors ######## # -## Read cached-* files from a local Tor data directory -ImportCachedRelayDescriptors = false +## Define descriptor sources +# possible values: Sync, Cache, Remote, Local +RelaySources = Remote +# Retrieve files from the following CollecTor instances. +# List of URLs separated by comma. +RelaySyncOrigins = https://collector.torproject.org # -## Relative path to Tor data directory to read cached-* files from +## Path to Tor data directory to read cached-* files from ## the listed path(s). If there is more that one separated by comma. -CachedRelayDescriptorsDirectories = in/relay-descriptors/cacheddesc/ -# -## Import directory archives from disk, if available -ImportDirectoryArchives = false -# +RelayCacheOrigins = in/relay-descriptors/cacheddesc/ ## Relative path to directory to import directory archives from -DirectoryArchivesDirectory = in/relay-descriptors/archives/ +RelayLocalOrigins = in/relay-descriptors/archives/ # ## Keep a history of imported directory archive files to know which files ## have been imported before. This history can be useful when importing @@ -85,9 +87,6 @@ DirectoryArchivesDirectory = in/relay-descriptors/archives/ ## again, but it can be confusing to users who don't know about it. KeepDirectoryArchiveImportHistory = false # -## Download relay descriptors from directory authorities, if required -DownloadRelayDescriptors = false -# ## Comma separated list of directory authority addresses (IP[:port]) to ## download missing relay descriptors from DirectoryAuthoritiesAddresses = 128.31.0.39:9131,86.59.21.38,194.109.206.212,131.188.40.189,193.23.244.244,171.25.193.9:443,154.35.175.225,199.254.238.52 @@ -132,8 +131,14 @@ CompressRelayDescriptorDownloads = false # ######## Bridge descriptors ######## # +## Define descriptor sources +# possible values: Sync, Local +BridgeSources = Local +# Retrieve files from the following instances. +# List of URLs separated by comma. +BridgeSyncOrigins = https://collector.torproject.org ## Relative path to directory to import bridge descriptor snapshots from -BridgeSnapshotsDirectory = in/bridge-descriptors/ +BridgeLocalOrigins = in/bridge-descriptors/ # ## Replace IP addresses in sanitized bridge descriptors with 10.x.y.z ## where x.y.z = H(IP address | bridge identity | secret)[:3], so that we @@ -147,9 +152,15 @@ BridgeDescriptorMappingsLimit = inf # ######## Exit lists ######## # +## Define descriptor sources +# possible values: Sync, Remote +ExitlistSources = Remote +## Retrieve files from the following instances. +## List of URLs separated by comma. +ExitlistSyncOrigins = https://collector.torproject.org ## Where to download exit-lists from. ExitlistUrl = https://check.torproject.org/exit-addresses - +# ######## Torperf downloader ######## # ## Torperf source names and base URLs diff --git a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java index 299bd92..947f486 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java +++ b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java @@ -132,7 +132,7 @@ public class SanitizedBridgesWriterTest { this.configuration.setProperty(Key.RecentPath.name(), recentDirectory.getAbsolutePath()); this.configuration.setProperty(Key.StatsPath.name(), statsDirectory); - this.configuration.setProperty(Key.BridgeSnapshotsDirectory.name(), + this.configuration.setProperty(Key.BridgeLocalOrigins.name(), bridgeDirectoriesDir); this.configuration.setProperty(Key.OutputPath.name(), sanitizedBridgesDirectory.toFile().getParent().toString()); diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index 8e255c6..3f9c231 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.Observable; import java.util.Observer; import java.util.Random; +import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; public class ConfigurationTest { @@ -40,7 +41,7 @@ public class ConfigurationTest { public void testKeyCount() throws Exception { assertEquals("The number of properties keys in enum Key changed." + "\n This test class should be adapted.", - 46, Key.values().length); + 50, Key.values().length); } @Test() @@ -70,11 +71,11 @@ public class ConfigurationTest { Configuration conf = new Configuration(); for (String input : arrays) { conf.clear(); - conf.setProperty(Key.CachedRelayDescriptorsDirectories.name(), input); + conf.setProperty(Key.RelayCacheOrigins.name(), input); assertArrayEquals("expected " + Arrays.toString(array) + "\nreceived: " + Arrays.toString(conf - .getStringArray(Key.CachedRelayDescriptorsDirectories)), - array, conf.getStringArray(Key.CachedRelayDescriptorsDirectories)); + .getStringArray(Key.RelayCacheOrigins)), + array, conf.getStringArray(Key.RelayCacheOrigins)); } } @@ -82,10 +83,10 @@ public class ConfigurationTest { public void testBoolValues() throws Exception { Configuration conf = new Configuration(); conf.setProperty(Key.CompressRelayDescriptorDownloads.name(), "false"); - conf.setProperty(Key.ImportDirectoryArchives.name(), "trUe"); + conf.setProperty(Key.RunOnce.name(), "trUe"); conf.setProperty(Key.ReplaceIpAddressesWithHashes.name(), "false"); assertFalse(conf.getBool(Key.CompressRelayDescriptorDownloads)); - assertTrue(conf.getBool(Key.ImportDirectoryArchives)); + assertTrue(conf.getBool(Key.RunOnce)); assertFalse(conf.getBool(Key.ReplaceIpAddressesWithHashes)); } @@ -117,6 +118,19 @@ public class ConfigurationTest { } @Test() + public void testSourceTypeValues() throws Exception { + String[] types = new String[] { "Local", "Cache", "Remote", "Sync"}; + Configuration conf = new Configuration(); + for (String type : types) { + conf.clear(); + conf.setProperty(Key.BridgeSources.name(), type); + Set<SourceType> sts = conf.getSourceTypeSet(Key.BridgeSources); + assertEquals(1, sts.size()); + assertTrue(sts.contains(SourceType.valueOf(type))); + } + } + + @Test() public void testArrayArrayValues() throws Exception { String[][] sourceStrings = new String[][] { new String[]{"localsource", "http://127.0.0.1:12345"}, @@ -129,17 +143,36 @@ public class ConfigurationTest { conf.getStringArrayArray(Key.TorperfSources)); } + @Test() + public void testUrlArrayValues() throws Exception { + URL[] array = new URL[randomSource.nextInt(30) + 1]; + for (int i = 0; i < array.length; i++) { + array[i] = new URL("https://" + + Integer.toBinaryString(randomSource.nextInt(100)) + ".dummy.org"); + } + String input = + Arrays.toString(array).replace("[", "").replace("]", "") + .replaceAll(" ", ""); + Configuration conf = new Configuration(); + conf.clear(); + conf.setProperty(Key.RelaySyncOrigins.name(), input); + assertArrayEquals("expected " + Arrays.toString(array) + "\nreceived: " + + Arrays.toString(conf + .getUrlArray(Key.RelaySyncOrigins)), + array, conf.getUrlArray(Key.RelaySyncOrigins)); + } + @Test(expected = ConfigurationException.class) public void testArrayArrayValueException() throws Exception { Configuration conf = new Configuration(); - conf.setProperty(Key.CachedRelayDescriptorsDirectories.name(), ""); + conf.setProperty(Key.RelayCacheOrigins.name(), ""); conf.getStringArrayArray(Key.OutputPath); } @Test(expected = ConfigurationException.class) public void testArrayValueException() throws Exception { Configuration conf = new Configuration(); - conf.setProperty(Key.CachedRelayDescriptorsDirectories.name(), ""); + conf.setProperty(Key.RelayCacheOrigins.name(), ""); conf.getStringArray(Key.TorperfSources); } @@ -147,14 +180,14 @@ public class ConfigurationTest { public void testBoolValueException() throws Exception { Configuration conf = new Configuration(); conf.setProperty(Key.TorperfSources.name(), "http://x.y.z"); - conf.getBool(Key.CachedRelayDescriptorsDirectories); + conf.getBool(Key.RelayCacheOrigins); } @Test(expected = ConfigurationException.class) public void testPathValueException() throws Exception { Configuration conf = new Configuration(); - conf.setProperty(Key.DirectoryArchivesDirectory.name(), "\\\u0000:"); - conf.getPath(Key.DirectoryArchivesDirectory); + conf.setProperty(Key.RelayLocalOrigins.name(), "\\\u0000:"); + conf.getPath(Key.RelayLocalOrigins); } @Test(expected = ConfigurationException.class) @@ -214,7 +247,7 @@ public class ConfigurationTest { conf.setWatchableSourceAndLoad(confFile.toPath()); MainTest.waitSec(1); confFile.delete(); - conf.setProperty(Key.ImportDirectoryArchives.name(), "false"); + conf.setProperty(Key.RunOnce.name(), "false"); final Dummy dummy = new Dummy(conf); tmpf.newFolder("empty"); MainTest.waitSec(6);

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit 0ef3d1182e0ef4b452d95c45de90accdf8a43d2a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:48:46 2016 +0000 Update translations for tails-onioncircuits --- th/onioncircuits.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/th/onioncircuits.pot b/th/onioncircuits.pot index c8c2930..7cd78b3 100644 --- a/th/onioncircuits.pot +++ b/th/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Thai Localization, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-01 09:23+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-10-12 17:21+0000\n" +"Last-Translator: Thai Localization\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" @@ -27,7 +28,7 @@ msgstr "" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "วงจร" #: ../onioncircuits:126 msgid "Status"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit 4318ed179ab0829377e530dffd6b57f60e672371 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:48:35 2016 +0000 Update translations for tails-openpgp-applet --- th/openpgp-applet.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/th/openpgp-applet.pot b/th/openpgp-applet.pot index 5c1a521..1445a3e 100644 --- a/th/openpgp-applet.pot +++ b/th/openpgp-applet.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Thai Localization, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2015-11-23 02:23+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2016-10-12 17:26+0000\n" +"Last-Translator: Thai Localization\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" @@ -75,7 +76,7 @@ msgstr "" #: bin/openpgp-applet:410 msgid "Name" -msgstr "Name" +msgstr "ชื่อ" #: bin/openpgp-applet:411 msgid "Key ID"

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit ff957600b457dc00456864a8ffc9f6a10283de2d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:48:19 2016 +0000 Update translations for tor-messenger-prefsdtd --- th/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/prefs.dtd b/th/prefs.dtd index e3a1af5..096e63c 100644 --- a/th/prefs.dtd +++ b/th/prefs.dtd @@ -1,7 +1,7 @@ <!ENTITY prefs.otrPreferences "OTR Preferences"> <!ENTITY prefs.otrLabel "OTR"> <!ENTITY prefs.coniksLabel "CONIKS"> -<!ENTITY prefs.otrSettings "OTR Settings"> +<!ENTITY prefs.otrSettings "การตั้งค่า OTR"> <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:">

1 0

[translation/tor-messenger-imtooltipproperties] Update translations for tor-messenger-imtooltipproperties
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit 6f72009052cbc835b7f1a21cea90cb179e17667f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:47:58 2016 +0000 Update translations for tor-messenger-imtooltipproperties --- th/imtooltip.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/imtooltip.properties b/th/imtooltip.properties index 0dd51fe..f9f7209 100644 --- a/th/imtooltip.properties +++ b/th/imtooltip.properties @@ -3,5 +3,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. buddy.username=Username -buddy.account=Account +buddy.account=บัญชี contact.tags=Tags

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit d990d998b414a6a0349994dff89002cac51e970a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:47:52 2016 +0000 Update translations for tor-messenger-fingerdtd --- th/finger.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/th/finger.dtd b/th/finger.dtd index d16d3db..f742c24 100644 --- a/th/finger.dtd +++ b/th/finger.dtd @@ -1,15 +1,15 @@ <!ENTITY finger.title "Known fingerprints"> <!ENTITY finger.screenName "Screenname"> <!ENTITY finger.status "สถานะ"> -<!ENTITY finger.verified "Verified"> +<!ENTITY finger.verified "ตรวจสอบแล้ว"> <!ENTITY finger.fingerprint "ลายนิ้วมือ"> -<!ENTITY finger.account "Account"> +<!ENTITY finger.account "บัญชี"> <!ENTITY finger.protocol "Protocol"> -<!ENTITY finger.verify "Verify"> +<!ENTITY finger.verify "ตรวจสอบ"> <!ENTITY finger.remove "Remove"> <!ENTITY finger.intro "Manage the list of fingerprints you've seen."> <!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> -<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.finger "ลายนิ้วมือ"> +<!ENTITY addFingerDialog.accept "ตกลง"> <!ENTITY addFingerDialog.cancel "Skip"> <!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit 0ff4c624b7a7ffb27aae2062bf690fbc603b25c3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:47:22 2016 +0000 Update translations for tor-messenger-authdtd --- th/auth.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/th/auth.dtd b/th/auth.dtd index 9957f21..8cbe46b 100644 --- a/th/auth.dtd +++ b/th/auth.dtd @@ -1,5 +1,5 @@ <!ENTITY authDialog.title "Verify contact's identity"> -<!ENTITY authDialog.authenticate "Verify"> +<!ENTITY authDialog.authenticate "ตรวจสอบ"> <!ENTITY authDialog.cancel "ยกเลิก"> <!ENTITY authDialog.help "ความช่วยเหลือ"> <!ENTITY authDialog.yes "ใช่"> @@ -8,14 +8,14 @@ <!ENTITY authDialog.yourFingerprint "Your fingerprint"> <!ENTITY authDialog.theirFingerprint "Their purported fingerprint"> <!ENTITY authDialog.manualVerification "Manual fingerprint verification"> -<!ENTITY authDialog.questionAndAnswer "Question and answer"> +<!ENTITY authDialog.questionAndAnswer "คำถามและคำตอบ"> <!ENTITY authDialog.sharedSecret "Shared secret"> <!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> <!ENTITY authDialog.choose "Choose"> <!ENTITY authDialog.how "How would you like to verify your contact's identity?"> <!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> <!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.question "Enter question here:"> +<!ENTITY authDialog.question "ป้อนคำถามที่นี่:"> <!ENTITY authDialog.answer "Enter secret answer here (case sensitive):"> <!ENTITY authDialog.secret "Enter secret here:"> <!ENTITY authDialog.waiting "Waiting for contact ..."> \ No newline at end of file

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 12 Oct '16

12 Oct '16

commit d8f3b699b74d04d99422776887b88d8f765e3a14 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 12 17:47:06 2016 +0000 Update translations for torbutton-aboutdialogdtd --- th/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/aboutdialog.dtd b/th/aboutdialog.dtd index 5099ad7..419d6a1 100644 --- a/th/aboutdialog.dtd +++ b/th/aboutdialog.dtd @@ -6,7 +6,7 @@ <!ENTITY help.start "Want to help? ">  <!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.or "หรือ">  <!ENTITY help.getInvolvedLink "get involved"> <!ENTITY help.end "!">

1 0