September 2017 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit 7a4767aad547fcda4e54e3c2c3535524ee981397 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 12:15:48 2017 +0000 Update translations for liveusb-creator --- ug@Arab/ug@Arab.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ug@Arab/ug@Arab.po b/ug@Arab/ug@Arab.po index 2eaf37659..3e2ee7958 100644 --- a/ug@Arab/ug@Arab.po +++ b/ug@Arab/ug@Arab.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-14 14:52+0200\n" -"PO-Revision-Date: 2017-09-14 13:47+0000\n" +"PO-Revision-Date: 2017-09-20 12:11+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit 368af436ddbafe0113182aa1f7df54d868983726 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 12:15:24 2017 +0000 Update translations for whisperback --- ug@Arab/ug@Arab.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ug@Arab/ug@Arab.po b/ug@Arab/ug@Arab.po index b1b270b62..322a4ab99 100644 --- a/ug@Arab/ug@Arab.po +++ b/ug@Arab/ug@Arab.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 08:24+0000\n" +"PO-Revision-Date: 2017-09-20 12:11+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit 1267ace14e3782c54a56e5da9313077236a74bb8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 12:15:15 2017 +0000 Update translations for torcheck --- ug(a)Arab/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ug(a)Arab/torcheck.po b/ug(a)Arab/torcheck.po index 75084c0eb..c637b2873 100644 --- a/ug(a)Arab/torcheck.po +++ b/ug(a)Arab/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-06-08 08:10+0000\n" +"PO-Revision-Date: 2017-09-20 12:11+0000\n" "Last-Translator: crash x <xmr.crashx(a)gmail.com>\n" "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit 4cc81f47e152e966106017b80c1544a548ce2410 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 12:15:05 2017 +0000 Update translations for bridgedb --- ug(a)Arab/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ug(a)Arab/LC_MESSAGES/bridgedb.po b/ug(a)Arab/LC_MESSAGES/bridgedb.po index 65f9033cb..63c911dfe 100644 --- a/ug(a)Arab/LC_MESSAGES/bridgedb.po +++ b/ug(a)Arab/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-06-07 19:14+0000\n" +"PO-Revision-Date: 2017-09-20 12:11+0000\n" "Last-Translator: crash x <xmr.crashx(a)gmail.com>\n" "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n" "MIME-Version: 1.0\n"

1 0

[collector/master] Make OnionPerf adhere to the standard CollecTorMain.
by karsten＠torproject.org 20 Sep '17

20 Sep '17

commit c4ab51e8dcdef8d8adb93d4cba7e35f82e1368ea Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 12 18:47:44 2017 +0000 Make OnionPerf adhere to the standard CollecTorMain. This includes adding property 'OnionPerfSources' and renaming some markers properly. In addition, all camel-case occurrences of 'OnionPerf' have a capitalized 'P' now. Part of task-21759. --- src/main/java/org/torproject/collector/Main.java | 4 ++-- src/main/java/org/torproject/collector/conf/Annotation.java | 2 +- .../java/org/torproject/collector/conf/Configuration.java | 2 +- src/main/java/org/torproject/collector/conf/Key.java | 7 ++++--- .../torproject/collector/exitlists/ExitListDownloader.java | 2 +- .../{OnionperfDownloader.java => OnionPerfDownloader.java} | 11 ++++++----- src/main/resources/collector.properties | 13 +++++++++---- src/test/java/org/torproject/collector/MainTest.java | 2 +- .../org/torproject/collector/conf/ConfigurationTest.java | 2 +- .../org/torproject/collector/cron/CollecTorMainTest.java | 1 + .../java/org/torproject/collector/cron/SchedulerTest.java | 10 +++++----- 11 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/collector/Main.java index 6676eb8..1377fec 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/collector/Main.java @@ -12,7 +12,7 @@ import org.torproject.collector.cron.Scheduler; import org.torproject.collector.cron.ShutdownHook; import org.torproject.collector.exitlists.ExitListDownloader; import org.torproject.collector.index.CreateIndexJson; -import org.torproject.collector.onionperf.OnionperfDownloader; +import org.torproject.collector.onionperf.OnionPerfDownloader; import org.torproject.collector.relaydescs.ArchiveWriter; import org.slf4j.Logger; @@ -50,7 +50,7 @@ public class Main { collecTorMains.put(Key.ExitlistsActivated, ExitListDownloader.class); collecTorMains.put(Key.UpdateindexActivated, CreateIndexJson.class); collecTorMains.put(Key.RelaydescsActivated, ArchiveWriter.class); - collecTorMains.put(Key.OnionperfActivated, OnionperfDownloader.class); + collecTorMains.put(Key.OnionPerfActivated, OnionPerfDownloader.class); } private static Configuration conf = new Configuration(); diff --git a/src/main/java/org/torproject/collector/conf/Annotation.java b/src/main/java/org/torproject/collector/conf/Annotation.java index e4e63d6..0dab546 100644 --- a/src/main/java/org/torproject/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/collector/conf/Annotation.java @@ -16,7 +16,7 @@ public enum Annotation { Microdescriptor("@type microdescriptor 1.0\n"), Server("@type server-descriptor 1.0\n"), Status("@type bridge-network-status 1.2\n"), - Onionperf("@type torperf 1.0\n"), + OnionPerf("@type torperf 1.0\n"), Vote("@type network-status-vote-3 1.0\n"); private final String annotation; diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index 4e24a7b..1a62bc1 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -92,7 +92,7 @@ public class Configuration extends Observable implements Cloneable { || this.getBool(Key.BridgedescsActivated) || this.getBool(Key.ExitlistsActivated) || this.getBool(Key.UpdateindexActivated) - || this.getBool(Key.OnionperfActivated))) { + || this.getBool(Key.OnionPerfActivated))) { throw new ConfigurationException("Nothing is activated!\n" + "Please edit collector.properties. Exiting."); } diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index e3bcff1..4341432 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -27,6 +27,7 @@ public enum Key { RelaySources(SourceType[].class), BridgeSources(SourceType[].class), ExitlistSources(SourceType[].class), + OnionPerfSources(SourceType[].class), RelayCacheOrigins(String[].class), RelayLocalOrigins(Path.class), RelaySyncOrigins(URL[].class), @@ -42,9 +43,9 @@ public enum Key { RelaydescsActivated(Boolean.class), RelaydescsOffsetMinutes(Integer.class), RelaydescsPeriodMinutes(Integer.class), - OnionperfActivated(Boolean.class), - OnionperfOffsetMinutes(Integer.class), - OnionperfPeriodMinutes(Integer.class), + OnionPerfActivated(Boolean.class), + OnionPerfOffsetMinutes(Integer.class), + OnionPerfPeriodMinutes(Integer.class), UpdateindexActivated(Boolean.class), UpdateindexOffsetMinutes(Integer.class), UpdateindexPeriodMinutes(Integer.class), diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index c27c970..b49189d 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -43,7 +43,7 @@ public class ExitListDownloader extends CollecTorMain { private String recentPathName; - /** Instanciate the exit-lists module using the given configuration. */ + /** Instantiate the exit-lists module using the given configuration. */ public ExitListDownloader(Configuration config) { super(config); this.mapPathDescriptors.put("recent/exit-lists", ExitList.class); diff --git a/src/main/java/org/torproject/collector/onionperf/OnionperfDownloader.java b/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java similarity index 97% rename from src/main/java/org/torproject/collector/onionperf/OnionperfDownloader.java rename to src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java index 577d16d..b2a27d4 100644 --- a/src/main/java/org/torproject/collector/onionperf/OnionperfDownloader.java +++ b/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java @@ -41,14 +41,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** Download download .tpf files from OnionPerf hosts. */ -public class OnionperfDownloader extends CollecTorMain { +public class OnionPerfDownloader extends CollecTorMain { private static final Logger logger = LoggerFactory.getLogger( - OnionperfDownloader.class); + OnionPerfDownloader.class); private static final String TORPERF = "torperf"; - public OnionperfDownloader(Configuration config) { + /** Instantiate the OnionPerf module using the given configuration. */ + public OnionPerfDownloader(Configuration config) { super(config); } @@ -72,12 +73,12 @@ public class OnionperfDownloader extends CollecTorMain { @Override public String module() { - return TORPERF; + return "onionperf"; } @Override protected String syncMarker() { - return "TorperfFiles"; + return "OnionPerf"; } @Override diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 54caf5a..d49bd58 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -30,11 +30,11 @@ RelaydescsPeriodMinutes = 30 # offset in minutes since the epoch and RelaydescsOffsetMinutes = 5 ## the following defines, if this module is activated -OnionperfActivated = false +OnionPerfActivated = false # period in minutes -OnionperfPeriodMinutes = 360 +OnionPerfPeriodMinutes = 360 # offset in minutes since the epoch and -OnionperfOffsetMinutes = 1 +OnionPerfOffsetMinutes = 1 # the following defines, if this module is activated UpdateindexActivated = false # period in minutes @@ -139,7 +139,11 @@ ExitlistSyncOrigins = https://collector.torproject.org ## Where to download exit-lists from. ExitlistUrl = https://check.torproject.org/exit-addresses # -######## Onionperf downloader ######## +######## OnionPerf downloader ######## +# +## Define descriptor sources +# possible values: Remote +OnionPerfSources = Remote # ## OnionPerf base URLs ## Hosts must be configured to use the first subdomain part of the given URL as @@ -147,3 +151,4 @@ ExitlistUrl = https://check.torproject.org/exit-addresses ## the second, etc.: ## OnionPerfHosts = http://first.torproject.org/, http://second.torproject.org/ OnionPerfHosts = https://op-us.onionperf.torproject.net/ + diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java index 2e9c0ce..b9cf5f8 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/collector/MainTest.java @@ -100,7 +100,7 @@ public class MainTest { Main.main(new String[]{conf.toString()}); assertTrue(4_000L <= conf.length()); changeFilePathsAndSetActivation(conf, - Key.OnionperfActivated.name()); + Key.OnionPerfActivated.name()); Main.main(new String[]{conf.toString()}); waitSec(2); } diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index a0c1dd1..bbe7832 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -40,7 +40,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.", - 43, Key.values().length); + 44, Key.values().length); } @Test() diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java index dc3e575..49f07ef 100644 --- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java @@ -70,6 +70,7 @@ public class CollecTorMainTest { case "Relay": case "Bridge": case "Exitlist": + case "OnionPerf": assertNotNull("Property '" + key + "' not specified in " + Main.CONF_FILE + ".", props.getProperty(key)); diff --git a/src/test/java/org/torproject/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/collector/cron/SchedulerTest.java index 63eb5af..062009f 100644 --- a/src/test/java/org/torproject/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/collector/cron/SchedulerTest.java @@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; public class SchedulerTest { private static final String runConfigProperties = - "OnionperfActivated=true\nOnionperfPeriodMinutes=1\n" - + "OnionperfOffsetMinutes=0\n" + "OnionPerfActivated=true\nOnionPerfPeriodMinutes=1\n" + + "OnionPerfOffsetMinutes=0\n" + "RelaydescsActivated=true\nRelaydescsPeriodMinutes=1\n" + "RelaydescsOffsetMinutes=0\n" + "ExitlistsActivated=true\nExitlistsPeriodMinutes=1\n" @@ -38,7 +38,7 @@ public class SchedulerTest { Map<Key, Class<? extends CollecTorMain>> ctms = new HashMap<>(); Configuration conf = new Configuration(); conf.load(new ByteArrayInputStream(runConfigProperties.getBytes())); - ctms.put(Key.OnionperfActivated, Dummy.class); + ctms.put(Key.OnionPerfActivated, Dummy.class); ctms.put(Key.BridgedescsActivated, Dummy.class); ctms.put(Key.RelaydescsActivated, Dummy.class); ctms.put(Key.ExitlistsActivated, Dummy.class); @@ -70,7 +70,7 @@ public class SchedulerTest { conf.load(new ByteArrayInputStream(("ShutdownGraceWaitMinutes=1\n" + runConfigProperties).getBytes())); conf.setProperty(Key.RunOnce.name(), "true"); - ctms.put(Key.OnionperfActivated, Counter.class); + ctms.put(Key.OnionPerfActivated, Counter.class); ctms.put(Key.BridgedescsActivated, Counter.class); ctms.put(Key.RelaydescsActivated, Counter.class); ctms.put(Key.ExitlistsActivated, Counter.class); @@ -93,7 +93,7 @@ public class SchedulerTest { Map<Key, Class<? extends CollecTorMain>> ctms = new HashMap<>(); Configuration conf = new Configuration(); conf.load(new ByteArrayInputStream(runConfigProperties.getBytes())); - ctms.put(Key.OnionperfActivated, Broken.class); + ctms.put(Key.OnionPerfActivated, Broken.class); ctms.put(Key.BridgedescsActivated, Broken.class); ctms.put(Key.RelaydescsActivated, Broken.class); ctms.put(Key.ExitlistsActivated, Broken.class);

1 0

[collector/master] Enable OnionPerf 'Sync' runs.
by karsten＠torproject.org 20 Sep '17

20 Sep '17

commit 8ffdfd6c2cd4a1d6a6f0660681e9a788b88dc342 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 12 18:47:45 2017 +0000 Enable OnionPerf 'Sync' runs. --- .../org/torproject/collector/conf/Annotation.java | 2 +- .../java/org/torproject/collector/conf/Key.java | 1 + .../collector/onionperf/OnionPerfDownloader.java | 1 + .../collector/persist/OnionPerfPersistence.java | 49 ++++++++++++++++++++++ .../torproject/collector/sync/SyncPersistence.java | 5 +++ src/main/resources/collector.properties | 5 ++- 6 files changed, 61 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/collector/conf/Annotation.java b/src/main/java/org/torproject/collector/conf/Annotation.java index 0dab546..23f485c 100644 --- a/src/main/java/org/torproject/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/collector/conf/Annotation.java @@ -16,7 +16,7 @@ public enum Annotation { Microdescriptor("@type microdescriptor 1.0\n"), Server("@type server-descriptor 1.0\n"), Status("@type bridge-network-status 1.2\n"), - OnionPerf("@type torperf 1.0\n"), + OnionPerf("@type torperf 1.1\n"), Vote("@type network-status-vote-3 1.0\n"); private final String annotation; diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index 4341432..72af4bb 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -34,6 +34,7 @@ public enum Key { BridgeSyncOrigins(URL[].class), BridgeLocalOrigins(Path.class), ExitlistSyncOrigins(URL[].class), + OnionPerfSyncOrigins(URL[].class), BridgedescsActivated(Boolean.class), BridgedescsOffsetMinutes(Integer.class), BridgedescsPeriodMinutes(Integer.class), diff --git a/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java index b2a27d4..36b006a 100644 --- a/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java @@ -51,6 +51,7 @@ public class OnionPerfDownloader extends CollecTorMain { /** Instantiate the OnionPerf module using the given configuration. */ public OnionPerfDownloader(Configuration config) { super(config); + this.mapPathDescriptors.put("recent/torperf", TorperfResult.class); } /** File containing the download history, which is necessary, because diff --git a/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java b/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java new file mode 100644 index 0000000..22093eb --- /dev/null +++ b/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java @@ -0,0 +1,49 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.collector.persist; + +import org.torproject.collector.conf.Annotation; +import org.torproject.descriptor.TorperfResult; + +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; + +public class OnionPerfPersistence + extends DescriptorPersistence<TorperfResult> { + + private static final String ONIONPERF = "torperf"; + + public OnionPerfPersistence(TorperfResult desc) { + super(desc, Annotation.OnionPerf.bytes()); + calculatePaths(); + } + + private void calculatePaths() { + String[] parts = PersistenceUtils.dateTimeParts(desc.getStartMillis()); + String name = desc.getSource() + DASH + desc.getFileSize() + DASH + + parts[0] + DASH + parts[1] + DASH + parts[2] + ".tpf"; + this.recentPath = Paths.get(ONIONPERF, name).toString(); + this.storagePath = Paths.get( + ONIONPERF, + parts[0], // year + parts[1], // month + parts[2], // day + name).toString(); + } + + /** OnionPerf default storage appends. */ + @Override + public boolean storeOut(String outRoot) { + return super.storeOut(outRoot, StandardOpenOption.APPEND); + } + + /** OnionPerf default storage appends. */ + @Override + public boolean storeAll(String recentRoot, String outRoot) { + return super.storeAll(recentRoot, outRoot, StandardOpenOption.APPEND, + StandardOpenOption.APPEND); + } + +} + diff --git a/src/main/java/org/torproject/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/collector/sync/SyncPersistence.java index 5fd6dc6..baca83d 100644 --- a/src/main/java/org/torproject/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/collector/sync/SyncPersistence.java @@ -13,6 +13,7 @@ import org.torproject.collector.persist.DescriptorPersistence; import org.torproject.collector.persist.ExitlistPersistence; import org.torproject.collector.persist.ExtraInfoPersistence; import org.torproject.collector.persist.MicroConsensusPersistence; +import org.torproject.collector.persist.OnionPerfPersistence; import org.torproject.collector.persist.PersistenceUtils; import org.torproject.collector.persist.ServerDescriptorPersistence; import org.torproject.collector.persist.StatusPersistence; @@ -26,6 +27,7 @@ import org.torproject.descriptor.RelayExtraInfoDescriptor; import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.RelayServerDescriptor; +import org.torproject.descriptor.TorperfResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,6 +129,9 @@ public class SyncPersistence { case "ExitList": // downloaded is part of desc, which to use? descPersist = new ExitlistPersistence((ExitList) desc, received); break; + case "TorperfResult": + descPersist = new OnionPerfPersistence((TorperfResult) desc); + break; default: log.trace("Invalid descriptor type {} for sync-merge.", clazz.getName()); diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index d49bd58..0a9f932 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -142,8 +142,11 @@ ExitlistUrl = https://check.torproject.org/exit-addresses ######## OnionPerf downloader ######## # ## Define descriptor sources -# possible values: Remote +# possible values: Remote,Sync OnionPerfSources = Remote +# Retrieve files from the following CollecTor instances. +# List of URLs separated by comma. +OnionPerfSyncOrigins = https://collector.torproject.org # ## OnionPerf base URLs ## Hosts must be configured to use the first subdomain part of the given URL as

1 0

[collector/master] Add changelog entries.
by karsten＠torproject.org 20 Sep '17

20 Sep '17

commit 41dd2605134c980c73df3218fc40e159a3e65530 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 12 18:47:48 2017 +0000 Add changelog entries. --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f9064e..0810fcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changes in version 1.?.? - 2017-??-?? + * Major changes + - Rename "Onionperf*" configuration options in collector.properties + to "OnionPerf*" (with capital P). + - Add "Sync" as OnionPerfSource to synchronize .tpf files from + other CollecTor instances. + * Minor changes - Remove all styling resources (fonts, CSS, etc.) from directory listings.

1 0

[collector/master] Adapt and add tests for OnionPerf sync-runs.
by karsten＠torproject.org 20 Sep '17

20 Sep '17

commit 4b3c2fef58363c7135bad21a883e9f17a57d001a Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 12 18:47:46 2017 +0000 Adapt and add tests for OnionPerf sync-runs. --- .../java/org/torproject/collector/conf/ConfigurationTest.java | 2 +- .../java/org/torproject/collector/sync/SyncPersistenceTest.java | 9 ++++++++- src/test/resources/op-nl-1048576-2017-04-11.tpf | 8 ++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index bbe7832..634bca5 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -40,7 +40,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.", - 44, Key.values().length); + 45, Key.values().length); } @Test() diff --git a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java index fe47f26..f0d30bc 100644 --- a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java +++ b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java @@ -43,6 +43,12 @@ public class SyncPersistenceTest { Integer.valueOf(1), // expected recent count of descs files Integer.valueOf(1)}, // expected output count of descs files + {"torperf/op-nl-1048576-2017-04-11.tpf", + new String[]{"torperf/2017/04/11/op-nl-1048576-2017-04-11.tpf"}, + "op-nl-1048576-2017-04-11.tpf", + Integer.valueOf(1), + Integer.valueOf(1)}, + {"relay-descriptors/server-descriptors/" + "2016-10-05-19-06-17-server-descriptors", new String[]{"relay-descriptors/server-descriptor/2016/10/e/3/" @@ -273,8 +279,9 @@ public class SyncPersistenceTest { List<String> content = Files.readAllLines(recentList.get(0).toPath(), StandardCharsets.UTF_8); List<String> expContent = linesFromResource(filename); - assertEquals(expContent.size(), content.size()); int contentSize = content.size(); + assertEquals("Number of lines incorrect for file '" + filename + "': " + + content, expContent.size(), contentSize); for (String line : expContent) { assertTrue("Couln't remove " + line + " from " + recentList.get(0), content.remove(line)); diff --git a/src/test/resources/op-nl-1048576-2017-04-11.tpf b/src/test/resources/op-nl-1048576-2017-04-11.tpf new file mode 100644 index 0000000..2396c2e --- /dev/null +++ b/src/test/resources/op-nl-1048576-2017-04-11.tpf @@ -0,0 +1,8 @@ +@type torperf 1.1 +BUILDTIMES=0.150000095367,0.230000019073,0.319999933243 CIRC_ID=664 CONNECT=1491891870.51 DATACOMPLETE=1491891877.51 DATAPERC0=1491891873.58 DATAPERC10=1491891874.32 DATAPERC100=1491891877.51 DATAPERC20=1491891874.68 DATAPERC30=1491891874.94 DATAPERC40=1491891875.37 DATAPERC50=1491891875.60 DATAPERC60=1491891875.95 DATAPERC70=1491891876.29 DATAPERC80=1491891876.68 DATAPERC90=1491891876.96 DATAREQUEST=1491891873.04 DATARESPONSE=1491891873.58 DIDTIMEOUT=0 ENDPOINTLOCAL=localhost:127.0.0.1:48934 ENDPOINTPROXY=localhost:127.0.0.1:43531 ENDPOINTREMOTE=5klxwn5wiwnd4xkm.onion:0.0.0.0:80 FILESIZE=1048576 HOSTNAMELOCAL=op-nl HOSTNAMEREMOTE=op-nl LAUNCH=1491891573.04 NEGOTIATE=1491891870.52 PATH=$34068126B7A8CE0247FA89A2F72F6C4A4DDD8F17,$3A6A156A01891A13DFAB19A16D2DBABB84F1869B,$75D4656446FE6625B6B773DA1E45222A902E3E8B QUANTILE=0.8 READBYTES=1048644 REQUEST=1491891870.52 RESPONSE=1491891873.04 SOCKET=1491891870.51 SOURCE=op-nl SOURCEADDRESS=unknown START=1491891870.51 TIMEOUT=1500 USED_AT=149 1891877.63 USED_BY=1406 WRITEBYTES=54 +@type torperf 1.1 +BUILDTIMES=0.0499999523163,0.0699999332428,0.120000123978 CIRC_ID=669 CONNECT=1491893670.52 DATACOMPLETE=1491893673.18 DATAPERC0=1491893671.99 DATAPERC10=1491893672.22 DATAPERC100=1491893673.18 DATAPERC20=1491893672.36 DATAPERC30=1491893672.45 DATAPERC40=1491893672.55 DATAPERC50=1491893672.65 DATAPERC60=1491893672.76 DATAPERC70=1491893672.87 DATAPERC80=1491893672.90 DATAPERC90=1491893673.06 DATAREQUEST=1491893671.83 DATARESPONSE=1491893671.99 DIDTIMEOUT=0 ENDPOINTLOCAL=localhost:127.0.0.1:49000 ENDPOINTPROXY=localhost:127.0.0.1:43531 ENDPOINTREMOTE=5klxwn5wiwnd4xkm.onion:0.0.0.0:80 FILESIZE=1048576 HOSTNAMELOCAL=op-nl HOSTNAMEREMOTE=op-nl LAUNCH=1491891871.04 NEGOTIATE=1491893670.52 PATH=$766A343C7623BE12976DDE361E47A3FD15C24ED9,$4FA9D001ED3BB02717C419DCC11644F2F2B2A592,$931BE618172446D534478988C01EE1CBD1874A97 QUANTILE=0.8 READBYTES=1048644 REQUEST=1491893670.52 RESPONSE=1491893671.83 SOCKET=1491893670.52 SOURCE=op-nl SOURCEADDRESS=unknown START=1491893670.52 TIMEOUT=1500 USED_AT=1 491893673.24 USED_BY=1436 WRITEBYTES=54 +@type torperf 1.1 +BUILDTIMES=0.00999999046326,0.039999961853,0.0799999237061 CIRC_ID=961 CONNECT=1491926070.57 DATACOMPLETE=1491926078.34 DATAPERC0=1491926072.18 DATAPERC10=1491926073.54 DATAPERC100=1491926078.34 DATAPERC20=1491926074.80 DATAPERC30=1491926075.81 DATAPERC40=1491926076.39 DATAPERC50=1491926076.85 DATAPERC60=1491926077.18 DATAPERC70=1491926077.53 DATAPERC80=1491926077.75 DATAPERC90=1491926077.97 DATAREQUEST=1491926071.80 DATARESPONSE=1491926072.18 DIDTIMEOUT=0 ENDPOINTLOCAL=localhost:127.0.0.1:50180 ENDPOINTPROXY=localhost:127.0.0.1:43531 ENDPOINTREMOTE=5klxwn5wiwnd4xkm.onion:0.0.0.0:80 FILESIZE=1048576 HOSTNAMELOCAL=op-nl HOSTNAMEREMOTE=op-nl LAUNCH=1491925174.04 NEGOTIATE=1491926070.57 PATH=$1A0AD1B2BAE9FEC4970186692B556B4BB7C57B3B,$86C281AD135058238D7A337D546C902BE8505DDE,$F1A98CA0FA1B3DE0AD71B97A6F5003A6BACA9FEB QUANTILE=0.8 READBYTES=1048644 REQUEST=1491926070.58 RESPONSE=1491926071.80 SOCKET=1491926070.57 SOURCE=op-nl SOURCEADDRESS=unknown START=1491926070.57 TIMEOUT=1500 USED_AT= 1491926078.4 USED_BY=2002 WRITEBYTES=54 +@type torperf 1.1 +BUILDTIMES=0.210000038147,0.299999952316,0.55999994278 CIRC_ID=888 CONNECT=1491916770.56 DATACOMPLETE=1491916773.22 DATAPERC0=1491916771.17 DATAPERC10=1491916771.44 DATAPERC100=1491916773.22 DATAPERC20=1491916771.71 DATAPERC30=1491916771.88 DATAPERC40=1491916772.05 DATAPERC50=1491916772.22 DATAPERC60=1491916772.44 DATAPERC70=1491916772.61 DATAPERC80=1491916772.78 DATAPERC90=1491916773.02 DATAREQUEST=1491916770.85 DATARESPONSE=1491916771.17 DIDTIMEOUT=0 ENDPOINTLOCAL=localhost:127.0.0.1:49868 ENDPOINTPROXY=localhost:127.0.0.1:43531 ENDPOINTREMOTE=37.218.247.40:37.218.247.40:80 FILESIZE=1048576 HOSTNAMELOCAL=op-nl HOSTNAMEREMOTE=op-nl LAUNCH=1491916530.04 NEGOTIATE=1491916770.56 PATH=$9E978553A45A53CDDCAEE81FCD5F6878CC920B2F,$0C9B3C686421C5A8C20BAA0D7369CD929F43A174,$DD808ECE4F2E24F377CBE11E335ECDA196FE3B78 QUANTILE=0.8 READBYTES=1048644 REQUEST=1491916770.56 RESPONSE=1491916770.85 SOCKET=1491916770.56 SOURCE=op-nl SOURCEADDRESS=unknown START=1491916770.56 TIMEOUT=1500 USED_AT=1491916 773.23 USED_BY=1854 WRITEBYTES=54

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit bcadda50c22d000a7fedd497b40552507627298e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 11:18:02 2017 +0000 Update translations for tails-openpgp-applet_completed --- ru/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 6b1206358..14bec4419 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-13 06:18+0000\n" +"PO-Revision-Date: 2017-09-20 10:51+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit 34b0952c3778e3692b3ac9136afbc82e79960a7d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 11:17:57 2017 +0000 Update translations for tails-openpgp-applet --- ru/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 6b1206358..14bec4419 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-13 06:18+0000\n" +"PO-Revision-Date: 2017-09-20 10:51+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0