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

[tor/maint-0.3.3] Bug 25705: Don't count circuit path failures as build failures.
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 937260af6a88680616aac578f3def329c7d9e3fe Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Apr 1 03:52:34 2018 +0000 Bug 25705: Don't count circuit path failures as build failures. Also emit a rate limited log message when they happen, since they are likely correlated with other issues. --- changes/bug25705 | 5 +++++ src/or/circuituse.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/changes/bug25705 b/changes/bug25705 new file mode 100644 index 000000000..360d96d4c --- /dev/null +++ b/changes/bug25705 @@ -0,0 +1,5 @@ + o Minor bugfixes (circuit path selection): + - Don't count path selection failures as circuit build failures. This + should eliminate cases where Tor blames its guard or the network + for situations like insufficient microdescriptors and/or overly + restrictive torrc settings. Fixes bug 25705; bugfix on 0.3.3.1-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3125fff65..93b7b2023 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1757,6 +1757,39 @@ circuit_build_failed(origin_circuit_t *circ) * the last hop or an earlier hop. then use this info below. */ int failed_at_last_hop = 0; + + /* First, check to see if this was a path failure, rather than build + * failure. + * + * Note that we deliberately use circuit_get_cpath_len() (and not + * circuit_get_cpath_opened_len()) because we only want to ensure + * that a full path is *chosen*. This is different than a full path + * being *built*. We only want to count *build* failures below. + * + * Path selection failures can happen spuriously for a number + * of reasons (such as aggressive/invalid user-specified path + * restrictions in the torrc, insufficient microdescriptors, and + * non-user reasons like exitpolicy issues), and so should not be + * counted as failures below. + */ + if (circuit_get_cpath_len(circ) < circ->build_state->desired_path_len) { + static ratelim_t pathfail_limit = RATELIM_INIT(3600); + log_fn_ratelim(&pathfail_limit, LOG_NOTICE, LD_CIRC, + "Our circuit %u (id: %" PRIu32 ") died due to an invalid " + "selected path, purpose %s. This may be a torrc " + "configuration issue, or a bug.", + TO_CIRCUIT(circ)->n_circ_id, circ->global_identifier, + circuit_purpose_to_string(TO_CIRCUIT(circ)->purpose)); + + /* If the path failed on an RP, retry it. */ + if (TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) + hs_circ_retry_service_rendezvous_point(circ); + + /* In all other cases, just bail. The rest is just failure accounting + * that we don't want to do */ + return; + } + /* If the last hop isn't open, and the second-to-last is, we failed * at the last hop. */ if (circ->cpath && @@ -1806,18 +1839,8 @@ circuit_build_failed(origin_circuit_t *circ) * If we have guard state (new guard API) and our path selection * code actually chose a full path, then blame the failure of this * circuit on the guard. - * - * Note that we deliberately use circuit_get_cpath_len() (and not - * circuit_get_cpath_opened_len()) because we only want to ensure - * that a full path is *chosen*. This is different than a full path - * being *built*. We only want to blame *build* failures on this - * guard. Path selection failures can happen spuriously for a number - * of reasons (such as aggressive/invalid user-specified path - * restrictions in the torrc, as well as non-user reasons like - * exitpolicy issues), and so should not be counted here. */ - if (circ->guard_state && - circuit_get_cpath_len(circ) >= circ->build_state->desired_path_len) + if (circ->guard_state) entry_guard_failed(&circ->guard_state); /* if there are any one-hop streams waiting on this circuit, fail * them now so they can retry elsewhere. */

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit fead22fb2ab2f31113ab6749ad01782aed90e95d Merge: 4c094436c 937260af6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:08:58 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3 changes/bug25705 | 5 +++++ src/or/circuituse.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-)

1 0

[metrics-lib/master] Resume previously aborted downloads.
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit a67a4713f64dca654928d10d6f5ff469540a47cf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 4 20:54:14 2018 +0200 Resume previously aborted downloads. So far, whenever DescriptorCollector fetches a remote file, it writes its contents to a local temporary file and later renames that file. The idea is to avoid incomplete downloads. However, if a local temporary file already exists from an earlier run, DescriptorCollector fails and skips the remote file. This is not intended. With this change, DescriptorCollector always overwrites a local temporary file when it finds one. It still doesn't delete incomplete temporary files that are not re-attempted later. But not skipping them is already a good start. Fixes #24153. --- CHANGELOG.md | 3 +++ .../org/torproject/descriptor/index/DescriptorIndexCollector.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e9ad5f..d6f79ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ after upgrading from Java 8 to 9. Applications must provide Apache Commons Codec 1.10 as dependency. + * Minor changes + - Make DescriptorCollector resume previously aborted downloads. + # Changes in version 2.4.0 - 2018-05-23 diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index be79386..873eb81 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -16,6 +16,7 @@ import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.SimpleFileVisitor; +import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; import java.util.Map; import java.util.SortedMap; @@ -120,7 +121,8 @@ public class DescriptorIndexCollector implements DescriptorCollector { destinationFile.getAbsolutePath()); try (InputStream is = new URL(baseUrl + "/" + filepathname) .openStream()) { - Files.copy(is, tempDestinationFile.toPath()); + Files.copy(is, tempDestinationFile.toPath(), + StandardCopyOption.REPLACE_EXISTING); if (tempDestinationFile.length() == entry.getValue().size) { tempDestinationFile.renameTo(destinationFile); destinationFile.setLastModified(lastModifiedMillis);

1 0

[tor/master] Make Tor compile with --disable-memory-sentinels again
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit b8554dd8804fc6e5e86962edd655bc80e32f9a75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 08:44:16 2018 -0400 Make Tor compile with --disable-memory-sentinels again --- src/lib/memarea/.may_include | 1 + src/lib/memarea/memarea.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/memarea/.may_include b/src/lib/memarea/.may_include index c55722284..814652a93 100644 --- a/src/lib/memarea/.may_include +++ b/src/lib/memarea/.may_include @@ -1,6 +1,7 @@ orconfig.h lib/arch/*.h lib/cc/*.h +lib/container/*.h lib/log/*.h lib/malloc/*.h lib/memarea/*.h diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c index 2d510a51a..9d494ab2d 100644 --- a/src/lib/memarea/memarea.c +++ b/src/lib/memarea/memarea.c @@ -14,8 +14,9 @@ #include <stdlib.h> #include <string.h> -#include "lib/cc/torint.h" #include "lib/arch/bytes.h" +#include "lib/cc/torint.h" +#include "lib/container/smartlist.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/malloc/util_malloc.h"

1 0

[collector/master] Prevent weird values in cut-off time calculation.
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 9d8a0ae6ece69746d17e4255a67cf50700018d6a Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Mar 26 11:01:56 2018 +0000 Prevent weird values in cut-off time calculation. Rename variable to include the unit (which is days). Log cut-off date on info level. Implements task-20224. --- CHANGELOG.md | 3 ++ .../bridgedescs/SanitizedBridgesWriter.java | 32 ++++++++++++++-------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e914f2f..31788f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ org.torproject.metrics.collector and ..index to ..indexer. - Fix a bug in the tarball-creation script where tarballs might not have been compressed in a run following an aborted run. + - Prevent weird values when calculating the cut-off date for + storing bridge sanitizer secrets using inf as the default value + of BridgeDescriptorMappingsLimit. # Changes in version 1.6.0 - 2018-05-23 diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index 23b91ad..8f28a2b 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -3,6 +3,8 @@ package org.torproject.metrics.collector.bridgedescs; +import static java.time.ZoneOffset.UTC; + import org.torproject.descriptor.BridgeExtraInfoDescriptor; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.BridgeServerDescriptor; @@ -32,6 +34,8 @@ import java.security.GeneralSecurityException; import java.security.SecureRandom; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -192,21 +196,27 @@ public class SanitizedBridgesWriter extends CollecTorMain { } } - long limitBridgeSanitizingInterval = - config.getInt(Key.BridgeDescriptorMappingsLimit); + long limitBridgeSanitizingIntervalDays + = config.getInt(Key.BridgeDescriptorMappingsLimit); /* If we're configured to keep secrets only for a limited time, define * the cut-off day and time. */ - if (limitBridgeSanitizingInterval >= 0L) { - SimpleDateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - formatter.setTimeZone(TimeZone.getTimeZone("UTC")); - this.bridgeSanitizingCutOffTimestamp = formatter.format( - System.currentTimeMillis() - 24L * 60L * 60L * 1000L - * limitBridgeSanitizingInterval); - } else { - this.bridgeSanitizingCutOffTimestamp = "1999-12-31 23:59:59"; + LocalDateTime bridgeSanitizingCutOffDateTime + = LocalDateTime.of(1999, 12, 31, 23, 59, 59); + if (limitBridgeSanitizingIntervalDays >= 0L) { + LocalDateTime configuredBridgeSanitizingCutOffDateTime + = LocalDateTime.now(UTC).minusDays(limitBridgeSanitizingIntervalDays); + if (configuredBridgeSanitizingCutOffDateTime.isAfter( + bridgeSanitizingCutOffDateTime)) { + bridgeSanitizingCutOffDateTime + = configuredBridgeSanitizingCutOffDateTime; + } } + this.bridgeSanitizingCutOffTimestamp = bridgeSanitizingCutOffDateTime + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + + logger.info("Using cut-off datetime '{}' for secrets.", + this.bridgeSanitizingCutOffTimestamp); // Prepare bridge descriptor parser BridgeDescriptorParser bdp = new BridgeDescriptorParser(this);

1 0

[collector/master] Fix bug in tarball-creating script.
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 98244f3ee1f546538c3d23f5bb84ba15fbb4c65d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 9 14:30:32 2018 +0200 Fix bug in tarball-creating script. The bug was that some tarballs were not compressed in a run following an aborted run. Fixes #26193. --- CHANGELOG.md | 2 ++ src/main/resources/create-tarballs.sh | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf2cfd3..e914f2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Rename root package org.torproject.collector to org.torproject.metrics.collector and ..index to ..indexer. + - Fix a bug in the tarball-creation script where tarballs might not + have been compressed in a run following an aborted run. # Changes in version 1.6.0 - 2018-05-23 diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index cd16b2d..b633826 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -99,10 +99,8 @@ done for (( i = 0 ; i < ${#TARBALLS[@]} ; i++ )); do echo `date` "Creating" ${TARBALLS[$i]}'.tar' tar chf ${TARBALLS[$i]}.tar ${TARBALLS[$i]} - if [ ! -f ${TARBALLS[$i]}.tar.xz ]; then - echo `date` "Compressing" ${TARBALLS[$i]}'.tar' - xz -9e ${TARBALLS[$i]}.tar - fi + echo `date` "Compressing" ${TARBALLS[$i]}'.tar' + xz -9e ${TARBALLS[$i]}.tar done cd $OUTDIR/webstats/

1 0

[collector/master] Rename packages.
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 9f05667878da3c24fc6098fdf9cfefadd40d6a7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 5 10:58:44 2018 +0200 Rename packages. Rename root package org.torproject.collector to org.torproject.metrics.collector and ..index to ..indexer. Implements #24291. --- CHANGELOG.md | 7 +++++ build.xml | 10 +++---- .../torproject/{ => metrics}/collector/Main.java | 26 ++++++++--------- .../bridgedescs/BridgeDescriptorParser.java | 4 +-- .../bridgedescs/BridgeSnapshotReader.java | 4 +-- .../collector/bridgedescs/DescriptorBuilder.java | 2 +- .../bridgedescs/SanitizedBridgesWriter.java | 12 ++++---- .../{ => metrics}/collector/conf/Annotation.java | 2 +- .../collector/conf/Configuration.java | 2 +- .../collector/conf/ConfigurationException.java | 2 +- .../{ => metrics}/collector/conf/Key.java | 2 +- .../{ => metrics}/collector/conf/SourceType.java | 2 +- .../collector/cron/CollecTorMain.java | 12 ++++---- .../{ => metrics}/collector/cron/Scheduler.java | 8 ++--- .../{ => metrics}/collector/cron/ShutdownHook.java | 2 +- .../collector/exitlists/ExitListDownloader.java | 12 ++++---- .../collector/indexer}/CreateIndexJson.java | 10 +++---- .../collector/onionperf/OnionPerfDownloader.java | 10 +++---- .../persist/BridgeExtraInfoPersistence.java | 4 +-- .../persist/BridgeServerDescriptorPersistence.java | 4 +-- .../collector/persist/ConsensusPersistence.java | 4 +-- .../collector/persist/DescriptorPersistence.java | 2 +- .../collector/persist/ExitlistPersistence.java | 4 +-- .../collector/persist/ExtraInfoPersistence.java | 4 +-- .../persist/MicroConsensusPersistence.java | 4 +-- .../collector/persist/OnionPerfPersistence.java | 4 +-- .../collector/persist/PersistenceUtils.java | 2 +- .../persist/ServerDescriptorPersistence.java | 4 +-- .../collector/persist/StatusPersistence.java | 4 +-- .../collector/persist/VotePersistence.java | 4 +-- .../persist/WebServerAccessLogPersistence.java | 2 +- .../collector/persist/package-info.java | 2 +- .../collector/relaydescs/ArchiveReader.java | 2 +- .../collector/relaydescs/ArchiveWriter.java | 16 +++++----- .../relaydescs/CachedRelayDescriptorReader.java | 2 +- .../collector/relaydescs/ReferenceChecker.java | 2 +- .../relaydescs/RelayDescriptorDownloader.java | 2 +- .../relaydescs/RelayDescriptorParser.java | 2 +- .../{ => metrics}/collector/sync/Criterium.java | 2 +- .../collector/sync/ProcessCriterium.java | 2 +- .../{ => metrics}/collector/sync/SyncManager.java | 9 +++--- .../collector/sync/SyncPersistence.java | 34 +++++++++++----------- .../{ => metrics}/collector/sync/package-info.java | 2 +- .../collector/webstats/LogFileMap.java | 2 +- .../collector/webstats/LogMetadata.java | 2 +- .../collector/webstats/SanitizeWeblogs.java | 17 +++++------ .../{ => metrics}/collector/MainTest.java | 10 +++---- .../bridgedescs/BridgeDescriptorParserTest.java | 4 +-- .../ExtraInfoTestDescriptorBuilder.java | 2 +- .../NetworkStatusTestDescriptorBuilder.java | 2 +- .../bridgedescs/SanitizedBridgesWriterTest.java | 10 +++---- .../bridgedescs/ServerTestDescriptorBuilder.java | 2 +- .../collector/bridgedescs/TarballTestBuilder.java | 2 +- .../bridgedescs/TestDescriptorBuilder.java | 2 +- .../collector/conf/ConfigurationTest.java | 8 ++--- .../{ => metrics}/collector/cron/Broken.java | 6 ++-- .../collector/cron/CollecTorMainTest.java | 10 +++---- .../{ => metrics}/collector/cron/Counter.java | 6 ++-- .../{ => metrics}/collector/cron/Dummy.java | 6 ++-- .../collector/cron/SchedulerTest.java | 8 ++--- .../collector/persist/PersistUtilsTest.java | 2 +- .../collector/relaydescs/ReferenceCheckerTest.java | 2 +- .../collector/sync/FileCollector.java | 2 +- .../collector/sync/SyncPersistenceTest.java | 6 ++-- .../collector/webstats/LogFileMapTest.java | 2 +- .../collector/webstats/LogMetadataTest.java | 2 +- .../collector/webstats/SanitizeWeblogsTest.java | 2 +- 67 files changed, 187 insertions(+), 182 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a88792..cf2cfd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 1.?.? - 2018-??-?? + + * Minor changes + - Rename root package org.torproject.collector to + org.torproject.metrics.collector and ..index to ..indexer. + + # Changes in version 1.6.0 - 2018-05-23 * Medium changes diff --git a/build.xml b/build.xml index e78c160..0c79d1e 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> <property name="release.version" value="1.6.0-dev" /> - <property name="project-main-class" value="org.torproject.collector.Main" /> + <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" /> <property name="jarincludes" value="collector.properties logback.xml" /> @@ -29,13 +29,13 @@ <target name="coverage-check"> <cobertura-check totallinerate="31" totalbranchrate="26" > - <regex pattern="org.torproject.collector.bridgedescs" + <regex pattern="org.torproject.metrics.collector.bridgedescs" branchrate="87" linerate="73"/> - <regex pattern="org.torproject.collector.conf" + <regex pattern="org.torproject.metrics.collector.conf" branchrate="87" linerate="100"/> - <regex pattern="org.torproject.collector.cron" + <regex pattern="org.torproject.metrics.collector.cron" branchrate="66" linerate="72" /> - <regex pattern="org.torproject.collector.Main" + <regex pattern="org.torproject.metrics.collector.Main" branchrate="100" linerate="91" /> </cobertura-check> </target> diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java similarity index 80% rename from src/main/java/org/torproject/collector/Main.java rename to src/main/java/org/torproject/metrics/collector/Main.java index 70cdbfa..6233dd2 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -1,20 +1,20 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector; +package org.torproject.metrics.collector; -import org.torproject.collector.bridgedescs.SanitizedBridgesWriter; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; -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.relaydescs.ArchiveWriter; -import org.torproject.collector.webstats.SanitizeWeblogs; +import org.torproject.metrics.collector.bridgedescs.SanitizedBridgesWriter; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.cron.Scheduler; +import org.torproject.metrics.collector.cron.ShutdownHook; +import org.torproject.metrics.collector.exitlists.ExitListDownloader; +import org.torproject.metrics.collector.indexer.CreateIndexJson; +import org.torproject.metrics.collector.onionperf.OnionPerfDownloader; +import org.torproject.metrics.collector.relaydescs.ArchiveWriter; +import org.torproject.metrics.collector.webstats.SanitizeWeblogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java similarity index 93% rename from src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java index 1b115ad..5134f0f 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java @@ -1,9 +1,9 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java similarity index 98% rename from src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 487aac8..1a58d84 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -1,9 +1,9 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.ConfigurationException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java similarity index 97% rename from src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java index 9d23adf..367e2e2 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java similarity index 99% rename from src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java rename to src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index af54e03..23b91ad 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -1,16 +1,16 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; -import org.torproject.collector.conf.Annotation; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.BridgeExtraInfoDescriptor; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.BridgeServerDescriptor; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/org/torproject/collector/conf/Annotation.java b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java similarity index 95% rename from src/main/java/org/torproject/collector/conf/Annotation.java rename to src/main/java/org/torproject/metrics/collector/conf/Annotation.java index 6a8094e..a796f4d 100644 --- a/src/main/java/org/torproject/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf; /** This enum contains all currently valid descriptor annotations. */ public enum Annotation { diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java similarity index 99% rename from src/main/java/org/torproject/collector/conf/Configuration.java rename to src/main/java/org/torproject/metrics/collector/conf/Configuration.java index 72bd5fc..503ebbf 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/conf/ConfigurationException.java b/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java similarity index 87% rename from src/main/java/org/torproject/collector/conf/ConfigurationException.java rename to src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java index 1d55341..5257434 100644 --- a/src/main/java/org/torproject/collector/conf/ConfigurationException.java +++ b/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf; public class ConfigurationException extends Exception { diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java similarity index 98% rename from src/main/java/org/torproject/collector/conf/Key.java rename to src/main/java/org/torproject/metrics/collector/conf/Key.java index 5e91e3e..ba4bcd9 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf; import java.net.URL; import java.nio.file.Path; diff --git a/src/main/java/org/torproject/collector/conf/SourceType.java b/src/main/java/org/torproject/metrics/collector/conf/SourceType.java similarity index 76% rename from src/main/java/org/torproject/collector/conf/SourceType.java rename to src/main/java/org/torproject/metrics/collector/conf/SourceType.java index 0ae18ce..984ff21 100644 --- a/src/main/java/org/torproject/collector/conf/SourceType.java +++ b/src/main/java/org/torproject/metrics/collector/conf/SourceType.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf; public enum SourceType { Cache, diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java similarity index 93% rename from src/main/java/org/torproject/collector/cron/CollecTorMain.java rename to src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java index d2a92f6..95f7445 100644 --- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java @@ -1,14 +1,14 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; -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.sync.SyncManager; import org.torproject.descriptor.Descriptor; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.conf.SourceType; +import org.torproject.metrics.collector.sync.SyncManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java similarity index 96% rename from src/main/java/org/torproject/collector/cron/Scheduler.java rename to src/main/java/org/torproject/metrics/collector/cron/Scheduler.java index ca8bc0a..1fc0039 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java @@ -1,11 +1,11 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/cron/ShutdownHook.java b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java similarity index 93% rename from src/main/java/org/torproject/collector/cron/ShutdownHook.java rename to src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java index b9bade6..70699f6 100644 --- a/src/main/java/org/torproject/collector/cron/ShutdownHook.java +++ b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java similarity index 95% rename from src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java rename to src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index 587f563..4ef8974 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -1,17 +1,17 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.exitlists; +package org.torproject.metrics.collector.exitlists; -import org.torproject.collector.conf.Annotation; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.ExitList; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java similarity index 95% rename from src/main/java/org/torproject/collector/index/CreateIndexJson.java rename to src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java index 5f030eb..55ebd15 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java @@ -1,16 +1,16 @@ /* Copyright 2015--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.index; +package org.torproject.metrics.collector.indexer; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.index.DirectoryNode; import org.torproject.descriptor.index.FileNode; import org.torproject.descriptor.index.IndexNode; import org.torproject.descriptor.internal.FileType; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/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/metrics/collector/onionperf/OnionPerfDownloader.java index 16a05e7..ab7c4f9 100644 --- a/src/main/java/org/torproject/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -1,16 +1,16 @@ /* Copyright 2012--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.onionperf; +package org.torproject.metrics.collector.onionperf; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.TorperfResult; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java index 1b8a602..23245c3 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.BridgeExtraInfoDescriptor; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java index 8ff7a1a..7694f14 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.BridgeServerDescriptor; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java similarity index 91% rename from src/main/java/org/torproject/collector/persist/ConsensusPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java index 4425634..b48077f 100644 --- a/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java similarity index 98% rename from src/main/java/org/torproject/collector/persist/DescriptorPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java index 01c9fad..ea3d67d 100644 --- a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; import org.torproject.descriptor.Descriptor; diff --git a/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java similarity index 89% rename from src/main/java/org/torproject/collector/persist/ExitlistPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java index d992cd5..307f3fa 100644 --- a/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.ExitList; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java index 93bdfe5..4ac8cba 100644 --- a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayExtraInfoDescriptor; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java similarity index 92% rename from src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java index 1858334..a3e189a 100644 --- a/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java similarity index 92% rename from src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java index d8e1b33..bc654a4 100644 --- a/src/main/java/org/torproject/collector/persist/OnionPerfPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.TorperfResult; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; diff --git a/src/main/java/org/torproject/collector/persist/PersistenceUtils.java b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java similarity index 98% rename from src/main/java/org/torproject/collector/persist/PersistenceUtils.java rename to src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java index 0537145..7d30cb1 100644 --- a/src/main/java/org/torproject/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java similarity index 91% rename from src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java index cd5d92c..bb0ae64 100644 --- a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayServerDescriptor; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/StatusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java similarity index 90% rename from src/main/java/org/torproject/collector/persist/StatusPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java index 165cf6c..c3cbf9e 100644 --- a/src/main/java/org/torproject/collector/persist/StatusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.BridgeNetworkStatus; +import org.torproject.metrics.collector.conf.Annotation; import java.nio.file.Paths; diff --git a/src/main/java/org/torproject/collector/persist/VotePersistence.java b/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java similarity index 95% rename from src/main/java/org/torproject/collector/persist/VotePersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java index 45f117f..a1bb032 100644 --- a/src/main/java/org/torproject/collector/persist/VotePersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; -import org.torproject.collector.conf.Annotation; import org.torproject.descriptor.RelayNetworkStatusVote; +import org.torproject.metrics.collector.conf.Annotation; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/persist/WebServerAccessLogPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java similarity index 97% rename from src/main/java/org/torproject/collector/persist/WebServerAccessLogPersistence.java rename to src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java index dab4112..b10f706 100644 --- a/src/main/java/org/torproject/collector/persist/WebServerAccessLogPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; import org.torproject.descriptor.WebServerAccessLog; import org.torproject.descriptor.internal.FileType; diff --git a/src/main/java/org/torproject/collector/persist/package-info.java b/src/main/java/org/torproject/metrics/collector/persist/package-info.java similarity index 87% rename from src/main/java/org/torproject/collector/persist/package-info.java rename to src/main/java/org/torproject/metrics/collector/persist/package-info.java index 6f75116..d3f6d2f 100644 --- a/src/main/java/org/torproject/collector/persist/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/persist/package-info.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; /** This package containes decorating classes for descriptors that * simply determine the two storage paths based on the descriptor diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index c665acb..22a3113 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java similarity index 98% rename from src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index e8d717a..11388f2 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -1,14 +1,8 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; - -import org.torproject.collector.conf.Annotation; -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; +package org.torproject.metrics.collector.relaydescs; + import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; @@ -17,6 +11,12 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.RelayServerDescriptor; import org.torproject.descriptor.UnparseableDescriptor; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.conf.SourceType; +import org.torproject.metrics.collector.cron.CollecTorMain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 4986509..5b5d218 100644 --- a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java index df0508a..83b3ae9 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index 453a466..a65ea9a 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java similarity index 99% rename from src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java rename to src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java index be26040..74e0ce9 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -1,7 +1,7 @@ /* Copyright 2010--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; diff --git a/src/main/java/org/torproject/collector/sync/Criterium.java b/src/main/java/org/torproject/metrics/collector/sync/Criterium.java similarity index 86% rename from src/main/java/org/torproject/collector/sync/Criterium.java rename to src/main/java/org/torproject/metrics/collector/sync/Criterium.java index b612794..c9d6212 100644 --- a/src/main/java/org/torproject/collector/sync/Criterium.java +++ b/src/main/java/org/torproject/metrics/collector/sync/Criterium.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync; /** Interface for decisions to be made in the sync-process. */ public interface Criterium<T> { diff --git a/src/main/java/org/torproject/collector/sync/ProcessCriterium.java b/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java similarity index 92% rename from src/main/java/org/torproject/collector/sync/ProcessCriterium.java rename to src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java index 8edcf15..d4ec149 100644 --- a/src/main/java/org/torproject/collector/sync/ProcessCriterium.java +++ b/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync; import org.torproject.descriptor.Descriptor; diff --git a/src/main/java/org/torproject/collector/sync/SyncManager.java b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java similarity index 95% rename from src/main/java/org/torproject/collector/sync/SyncManager.java rename to src/main/java/org/torproject/metrics/collector/sync/SyncManager.java index c7300b4..005501f 100644 --- a/src/main/java/org/torproject/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java @@ -1,11 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; - -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; +package org.torproject.metrics.collector.sync; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorCollector; @@ -13,6 +9,9 @@ import org.torproject.descriptor.DescriptorReader; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.UnparseableDescriptor; import org.torproject.descriptor.index.DescriptorIndexCollector; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java similarity index 82% rename from src/main/java/org/torproject/collector/sync/SyncPersistence.java rename to src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index 142be7a..bbd3103 100644 --- a/src/main/java/org/torproject/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -1,24 +1,8 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.persist.BridgeExtraInfoPersistence; -import org.torproject.collector.persist.BridgeServerDescriptorPersistence; -import org.torproject.collector.persist.ConsensusPersistence; -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; -import org.torproject.collector.persist.VotePersistence; -import org.torproject.collector.persist.WebServerAccessLogPersistence; import org.torproject.descriptor.BridgeExtraInfoDescriptor; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.BridgeServerDescriptor; @@ -30,6 +14,22 @@ import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.RelayServerDescriptor; import org.torproject.descriptor.TorperfResult; import org.torproject.descriptor.WebServerAccessLog; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.persist.BridgeExtraInfoPersistence; +import org.torproject.metrics.collector.persist.BridgeServerDescriptorPersistence; +import org.torproject.metrics.collector.persist.ConsensusPersistence; +import org.torproject.metrics.collector.persist.DescriptorPersistence; +import org.torproject.metrics.collector.persist.ExitlistPersistence; +import org.torproject.metrics.collector.persist.ExtraInfoPersistence; +import org.torproject.metrics.collector.persist.MicroConsensusPersistence; +import org.torproject.metrics.collector.persist.OnionPerfPersistence; +import org.torproject.metrics.collector.persist.PersistenceUtils; +import org.torproject.metrics.collector.persist.ServerDescriptorPersistence; +import org.torproject.metrics.collector.persist.StatusPersistence; +import org.torproject.metrics.collector.persist.VotePersistence; +import org.torproject.metrics.collector.persist.WebServerAccessLogPersistence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/sync/package-info.java b/src/main/java/org/torproject/metrics/collector/sync/package-info.java similarity index 90% rename from src/main/java/org/torproject/collector/sync/package-info.java rename to src/main/java/org/torproject/metrics/collector/sync/package-info.java index 241fde7..401fb84 100644 --- a/src/main/java/org/torproject/collector/sync/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/sync/package-info.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync; /** This package coordinates syncing and merging the fetched data. * <p>The central class for this process is <code>SyncManager</code>, which diff --git a/src/main/java/org/torproject/collector/webstats/LogFileMap.java b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java similarity index 98% rename from src/main/java/org/torproject/collector/webstats/LogFileMap.java rename to src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java index c1a6802..0d23f9a 100644 --- a/src/main/java/org/torproject/collector/webstats/LogFileMap.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/torproject/collector/webstats/LogMetadata.java b/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java similarity index 98% rename from src/main/java/org/torproject/collector/webstats/LogMetadata.java rename to src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java index ee0db1a..c74cbcb 100644 --- a/src/main/java/org/torproject/collector/webstats/LogMetadata.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats; import static org.torproject.descriptor.log.WebServerAccessLogImpl.MARKER; diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java similarity index 95% rename from src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java rename to src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index 88d1456..3d25cea 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats; import static java.util.stream.Collectors.counting; import static java.util.stream.Collectors.groupingBy; @@ -9,14 +9,6 @@ import static java.util.stream.Collectors.groupingByConcurrent; import static java.util.stream.Collectors.reducing; import static java.util.stream.Collectors.summingLong; -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.collector.persist.PersistenceUtils; -import org.torproject.collector.persist.WebServerAccessLogPersistence; import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.Method; import org.torproject.descriptor.WebServerAccessLog; @@ -25,6 +17,13 @@ import org.torproject.descriptor.log.InternalLogDescriptor; import org.torproject.descriptor.log.InternalWebServerAccessLog; import org.torproject.descriptor.log.WebServerAccessLogImpl; import org.torproject.descriptor.log.WebServerAccessLogLine; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.conf.SourceType; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.persist.PersistenceUtils; +import org.torproject.metrics.collector.persist.WebServerAccessLogPersistence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/metrics/collector/MainTest.java similarity index 96% rename from src/test/java/org/torproject/collector/MainTest.java rename to src/test/java/org/torproject/metrics/collector/MainTest.java index 28d3571..6459040 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/metrics/collector/MainTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector; +package org.torproject.metrics.collector; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -9,10 +9,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; -import org.torproject.collector.cron.Scheduler; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.Scheduler; import org.hamcrest.Matchers; import org.junit.Rule; diff --git a/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java similarity index 92% rename from src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java index 2d4e175..040d161 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java @@ -1,9 +1,9 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; -import org.torproject.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Configuration; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java similarity index 97% rename from src/test/java/org/torproject/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java index 71d52e9..45d6925 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import java.util.Arrays; diff --git a/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java similarity index 95% rename from src/test/java/org/torproject/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java index b8c1cc9..d04fc3c 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import java.util.Arrays; diff --git a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java similarity index 99% rename from src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java index 41a88c6..91332a5 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java @@ -1,17 +1,17 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.torproject.collector.Main; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; -import org.torproject.collector.conf.Key; +import org.torproject.metrics.collector.Main; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/torproject/collector/bridgedescs/ServerTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java similarity index 98% rename from src/test/java/org/torproject/collector/bridgedescs/ServerTestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java index b23c9e9..c0a6bf5 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/ServerTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import java.util.Arrays; diff --git a/src/test/java/org/torproject/collector/bridgedescs/TarballTestBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java similarity index 98% rename from src/test/java/org/torproject/collector/bridgedescs/TarballTestBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java index 2cfe0f5..44f4490 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/TarballTestBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import static org.junit.Assert.fail; diff --git a/src/test/java/org/torproject/collector/bridgedescs/TestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java similarity index 98% rename from src/test/java/org/torproject/collector/bridgedescs/TestDescriptorBuilder.java rename to src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java index 73c00b7..2fad06a 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/TestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.bridgedescs; +package org.torproject.metrics.collector.bridgedescs; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java similarity index 97% rename from src/test/java/org/torproject/collector/conf/ConfigurationTest.java rename to src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index e408109..d91013b 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -1,16 +1,16 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.conf; +package org.torproject.metrics.collector.conf; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.torproject.collector.MainTest; -import org.torproject.collector.cron.CollecTorMain; -import org.torproject.collector.cron.Dummy; +import org.torproject.metrics.collector.MainTest; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.cron.Dummy; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/cron/Broken.java b/src/test/java/org/torproject/metrics/collector/cron/Broken.java similarity index 81% rename from src/test/java/org/torproject/collector/cron/Broken.java rename to src/test/java/org/torproject/metrics/collector/cron/Broken.java index 95fec3b..ef896bf 100644 --- a/src/test/java/org/torproject/collector/cron/Broken.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Broken.java @@ -1,10 +1,10 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java similarity index 91% rename from src/test/java/org/torproject/collector/cron/CollecTorMainTest.java rename to src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java index 025f96c..78b6ac7 100644 --- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java @@ -1,17 +1,17 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.torproject.collector.Main; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.Key; -import org.torproject.collector.sync.SyncManager; +import org.torproject.metrics.collector.Main; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.sync.SyncManager; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/cron/Counter.java b/src/test/java/org/torproject/metrics/collector/cron/Counter.java similarity index 72% rename from src/test/java/org/torproject/collector/cron/Counter.java rename to src/test/java/org/torproject/metrics/collector/cron/Counter.java index ad0882e..d48b62c 100644 --- a/src/test/java/org/torproject/collector/cron/Counter.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Counter.java @@ -1,7 +1,7 @@ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/org/torproject/collector/cron/Dummy.java b/src/test/java/org/torproject/metrics/collector/cron/Dummy.java similarity index 66% rename from src/test/java/org/torproject/collector/cron/Dummy.java rename to src/test/java/org/torproject/metrics/collector/cron/Dummy.java index 039182b..1110676 100644 --- a/src/test/java/org/torproject/collector/cron/Dummy.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Dummy.java @@ -1,7 +1,7 @@ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; public class Dummy extends CollecTorMain { diff --git a/src/test/java/org/torproject/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java similarity index 95% rename from src/test/java/org/torproject/collector/cron/SchedulerTest.java rename to src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java index 5e38a36..e0496fb 100644 --- a/src/test/java/org/torproject/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java @@ -1,14 +1,14 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.cron; +package org.torproject.metrics.collector.cron; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.torproject.collector.MainTest; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.Key; +import org.torproject.metrics.collector.MainTest; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Key; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java b/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java similarity index 98% rename from src/test/java/org/torproject/collector/persist/PersistUtilsTest.java rename to src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java index d2801be..6774923 100644 --- a/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java +++ b/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.persist; +package org.torproject.metrics.collector.persist; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java similarity index 98% rename from src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java rename to src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java index da2d9ad..19672fc 100644 --- a/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java +++ b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.relaydescs; +package org.torproject.metrics.collector.relaydescs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/torproject/collector/sync/FileCollector.java b/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java similarity index 93% rename from src/test/java/org/torproject/collector/sync/FileCollector.java rename to src/test/java/org/torproject/metrics/collector/sync/FileCollector.java index 681b113..57d9216 100644 --- a/src/test/java/org/torproject/collector/sync/FileCollector.java +++ b/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync; import java.io.File; import java.io.IOException; diff --git a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java similarity index 99% rename from src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java rename to src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java index 489a413..0a20338 100644 --- a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java +++ b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java @@ -1,15 +1,15 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.sync; +package org.torproject.metrics.collector.sync; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.torproject.collector.conf.Configuration; -import org.torproject.collector.conf.Key; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.Key; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/torproject/collector/webstats/LogFileMapTest.java b/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java similarity index 93% rename from src/test/java/org/torproject/collector/webstats/LogFileMapTest.java rename to src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java index d55ba40..89cfc10 100644 --- a/src/test/java/org/torproject/collector/webstats/LogFileMapTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/torproject/collector/webstats/LogMetadataTest.java b/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java similarity index 98% rename from src/test/java/org/torproject/collector/webstats/LogMetadataTest.java rename to src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java index 6121e8d..9a58cb9 100644 --- a/src/test/java/org/torproject/collector/webstats/LogMetadataTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java b/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java similarity index 88% rename from src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java rename to src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java index 9ad4996..a550c41 100644 --- a/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.collector.webstats; +package org.torproject.metrics.collector.webstats; import static org.junit.Assert.assertEquals;

1 0

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

09 Jul '18

commit 14642a9c8d025beda5182ad491a06c542b6c55c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 9 01:16:27 2018 +0000 Update translations for tor-launcher-properties --- lt/torlauncher.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/torlauncher.properties b/lt/torlauncher.properties index cdc0df3ee..963d5cf4a 100644 --- a/lt/torlauncher.properties +++ b/lt/torlauncher.properties @@ -29,8 +29,8 @@ torlauncher.error_default_bridges_type_missing=Privalote nurodytiems tinklų til torlauncher.error_bridgedb_bridges_missing=Please request a bridge. torlauncher.error_bridge_bad_default_type=Neprieinamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome sureguliuoti savo nustatymus. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(veikia Kinijoje) +torlauncher.bridge_suffix.meek-azure=(veikia Kinijoje) torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida torlauncher.bootstrapWarning.pt_missing=trūksta prijungiamo perdavimo -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Ryšys su serveriu nutrūko. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nepavyko prisijungti prie serverio. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nepavyko prisijungti prie tarpinio serverio.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 09 Jul '18

09 Jul '18

commit d9fa210ca85c4b774b90421f993e38e7fe629fe4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 8 22:45:11 2018 +0000 Update translations for bridgedb_completed --- lt/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index 62ff21745..4f3921358 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -9,21 +9,22 @@ # Saule Papeckyte <saule.papeckyte(a)gmail.com>, 2015 # Edgaras7 <system(a)vippsystems.com>, 2014 # Tautvydas Zukauskas <lordmu(a)linuxmail.org>, 2016 -# TylQuest <tylquest(a)gmail.com>, 2014 +# Tomas Darius Davainis <tomasdd(a)gmail.com>, 2018 +# TylQuest, 2014 msgid "" 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: 2017-09-20 01:04+0000\n" -"Last-Translator: Moo\n" +"PO-Revision-Date: 2018-07-08 22:27+0000\n" +"Last-Translator: Tomas Darius Davainis <tomasdd(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" "Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): @@ -38,7 +39,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Atleiskite! Kažkas nutiko su jūsų užklausa." +msgstr "Atleiskite! Kažkas nutiko jūsų užklausai." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 09 Jul '18

09 Jul '18

commit 54d51dd6678af83930e9671f0db0a27d942aa094 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 8 22:45:04 2018 +0000 Update translations for bridgedb --- lt/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index 62ff21745..4f3921358 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -9,21 +9,22 @@ # Saule Papeckyte <saule.papeckyte(a)gmail.com>, 2015 # Edgaras7 <system(a)vippsystems.com>, 2014 # Tautvydas Zukauskas <lordmu(a)linuxmail.org>, 2016 -# TylQuest <tylquest(a)gmail.com>, 2014 +# Tomas Darius Davainis <tomasdd(a)gmail.com>, 2018 +# TylQuest, 2014 msgid "" 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: 2017-09-20 01:04+0000\n" -"Last-Translator: Moo\n" +"PO-Revision-Date: 2018-07-08 22:27+0000\n" +"Last-Translator: Tomas Darius Davainis <tomasdd(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" "Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): @@ -38,7 +39,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Atleiskite! Kažkas nutiko su jūsų užklausa." +msgstr "Atleiskite! Kažkas nutiko jūsų užklausai." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0