January 2020 - tor-commits - lists.torproject.org

[metrics-lib/release] Parse three new lines in snowflake statistics.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 5fb36b70c884073963af8e9cb3a37fa907eb35b8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 10:16:29 2019 +0100 Parse three new lines in snowflake statistics. Implements #32665. --- CHANGELOG.md | 5 ++- .../org/torproject/descriptor/SnowflakeStats.java | 30 +++++++++++++ .../java/org/torproject/descriptor/impl/Key.java | 3 ++ .../descriptor/impl/SnowflakeStatsImpl.java | 51 +++++++++++++++++++++- .../descriptor/impl/SnowflakeStatsImplTest.java | 12 +++++ 5 files changed, 98 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad91d5d..8d3ab12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 2.?.? - 2019-1?-?? +# Changes in version 2.10.0 - 2019-1?-?? + + * Medium changes + - Parse three newly added lines in snowflake statistics files. * Minor changes - Fix a NullPointerException when parsing an invalid crypto block diff --git a/src/main/java/org/torproject/descriptor/SnowflakeStats.java b/src/main/java/org/torproject/descriptor/SnowflakeStats.java index 379a0f7..5c464df 100644 --- a/src/main/java/org/torproject/descriptor/SnowflakeStats.java +++ b/src/main/java/org/torproject/descriptor/SnowflakeStats.java @@ -52,6 +52,36 @@ public interface SnowflakeStats extends Descriptor { Optional<Long> snowflakeIpsTotal(); /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies of type "standalone" that have polled. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies of type "standalone" that have polled. + * @since 2.10.0 + */ + Optional<Long> snowflakeIpsStandalone(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies of type "badge" that have polled. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies of type "badge" that have polled. + * @since 2.10.0 + */ + Optional<Long> snowflakeIpsBadge(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies of type "webext" that have polled. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies of type "webext" that have polled. + * @since 2.10.0 + */ + Optional<Long> snowflakeIpsWebext(); + + /** * Return a count of the number of times a proxy has polled but received no * client offer, rounded up to the nearest multiple of 8. * diff --git a/src/main/java/org/torproject/descriptor/impl/Key.java b/src/main/java/org/torproject/descriptor/impl/Key.java index ac12992..10839dd 100644 --- a/src/main/java/org/torproject/descriptor/impl/Key.java +++ b/src/main/java/org/torproject/descriptor/impl/Key.java @@ -139,7 +139,10 @@ public enum Key { SIGNING_KEY("signing-key"), SNOWFLAKE_IDLE_COUNT("snowflake-idle-count"), SNOWFLAKE_IPS("snowflake-ips"), + SNOWFLAKE_IPS_BADGE("snowflake-ips-badge"), + SNOWFLAKE_IPS_STANDALONE("snowflake-ips-standalone"), SNOWFLAKE_IPS_TOTAL("snowflake-ips-total"), + SNOWFLAKE_IPS_WEBEXT("snowflake-ips-webext"), SNOWFLAKE_STATS_END("snowflake-stats-end"), TRANSPORT("transport"), TUNNELLED_DIR_SERVER("tunnelled-dir-server"), diff --git a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java index 9922756..daaa933 100644 --- a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java @@ -20,8 +20,10 @@ public class SnowflakeStatsImpl extends DescriptorImpl implements SnowflakeStats { private static final Set<Key> atMostOnce = EnumSet.of( - Key.SNOWFLAKE_IPS, Key.SNOWFLAKE_IPS_TOTAL, Key.SNOWFLAKE_IDLE_COUNT, - Key.CLIENT_DENIED_COUNT, Key.CLIENT_SNOWFLAKE_MATCH_COUNT); + Key.SNOWFLAKE_IPS, Key.SNOWFLAKE_IPS_TOTAL, Key.SNOWFLAKE_IPS_STANDALONE, + Key.SNOWFLAKE_IPS_BADGE, Key.SNOWFLAKE_IPS_WEBEXT, + Key.SNOWFLAKE_IDLE_COUNT, Key.CLIENT_DENIED_COUNT, + Key.CLIENT_SNOWFLAKE_MATCH_COUNT); private static final Set<Key> exactlyOnce = EnumSet.of( Key.SNOWFLAKE_STATS_END); @@ -61,6 +63,15 @@ public class SnowflakeStatsImpl extends DescriptorImpl case SNOWFLAKE_IPS_TOTAL: this.parseSnowflakeIpsTotal(line, parts); break; + case SNOWFLAKE_IPS_STANDALONE: + this.parseSnowflakeIpsStandalone(line, parts); + break; + case SNOWFLAKE_IPS_BADGE: + this.parseSnowflakeIpsBadge(line, parts); + break; + case SNOWFLAKE_IPS_WEBEXT: + this.parseSnowflakeIpsWebext(line, parts); + break; case SNOWFLAKE_IDLE_COUNT: this.parseSnowflakeIdleCount(line, parts); break; @@ -104,6 +115,21 @@ public class SnowflakeStatsImpl extends DescriptorImpl this.snowflakeIpsTotal = ParseHelper.parseLong(line, parts, 1); } + private void parseSnowflakeIpsStandalone(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsStandalone = ParseHelper.parseLong(line, parts, 1); + } + + private void parseSnowflakeIpsBadge(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsBadge = ParseHelper.parseLong(line, parts, 1); + } + + private void parseSnowflakeIpsWebext(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsWebext = ParseHelper.parseLong(line, parts, 1); + } + private void parseSnowflakeIdleCount(String line, String[] parts) throws DescriptorParseException { this.snowflakeIdleCount = ParseHelper.parseLong(line, parts, 1); @@ -147,6 +173,27 @@ public class SnowflakeStatsImpl extends DescriptorImpl return Optional.ofNullable(this.snowflakeIpsTotal); } + private Long snowflakeIpsStandalone; + + @Override + public Optional<Long> snowflakeIpsStandalone() { + return Optional.ofNullable(this.snowflakeIpsStandalone); + } + + private Long snowflakeIpsBadge; + + @Override + public Optional<Long> snowflakeIpsBadge() { + return Optional.ofNullable(this.snowflakeIpsBadge); + } + + private Long snowflakeIpsWebext; + + @Override + public Optional<Long> snowflakeIpsWebext() { + return Optional.ofNullable(this.snowflakeIpsWebext); + } + private Long snowflakeIdleCount; @Override diff --git a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java index 6d0e50b..0378fbc 100644 --- a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java @@ -35,6 +35,9 @@ public class SnowflakeStatsImplTest { + "PK=4,ID=9,IR=7,JO=2,CR=2,US=265,DE=92,LV=1,MY=8,AR=5,NZ=10,BG=2," + "UY=1,TW=5,SI=3,LU=2,GE=2,BN=1,JP=15,ES=9,SG=7,EC=1", "snowflake-ips-total 937", + "snowflake-ips-standalone 3", + "snowflake-ips-badge 0", + "snowflake-ips-webext 4118", "snowflake-idle-count 660976", "client-denied-count 0", "client-snowflake-match-count 864" }; @@ -51,6 +54,12 @@ public class SnowflakeStatsImplTest { assertEquals(68, snowflakeStats.snowflakeIps().get().size()); assertTrue(snowflakeStats.snowflakeIpsTotal().isPresent()); assertEquals((Long) 937L, snowflakeStats.snowflakeIpsTotal().get()); + assertTrue(snowflakeStats.snowflakeIpsStandalone().isPresent()); + assertEquals((Long) 3L, snowflakeStats.snowflakeIpsStandalone().get()); + assertTrue(snowflakeStats.snowflakeIpsBadge().isPresent()); + assertEquals((Long) 0L, snowflakeStats.snowflakeIpsBadge().get()); + assertTrue(snowflakeStats.snowflakeIpsWebext().isPresent()); + assertEquals((Long) 4118L, snowflakeStats.snowflakeIpsWebext().get()); assertTrue(snowflakeStats.snowflakeIdleCount().isPresent()); assertEquals((Long) 660976L, snowflakeStats.snowflakeIdleCount().get()); assertTrue(snowflakeStats.clientDeniedCount().isPresent()); @@ -69,6 +78,9 @@ public class SnowflakeStatsImplTest { snowflakeStats.snowflakeStatsIntervalLength()); assertFalse(snowflakeStats.snowflakeIps().isPresent()); assertFalse(snowflakeStats.snowflakeIpsTotal().isPresent()); + assertFalse(snowflakeStats.snowflakeIpsStandalone().isPresent()); + assertFalse(snowflakeStats.snowflakeIpsBadge().isPresent()); + assertFalse(snowflakeStats.snowflakeIpsWebext().isPresent()); assertFalse(snowflakeStats.snowflakeIdleCount().isPresent()); assertFalse(snowflakeStats.clientDeniedCount().isPresent()); assertFalse(snowflakeStats.clientSnowflakeMatchCount().isPresent());

1 0

[metrics-lib/release] Remove unused methods.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 067add639b8cd260b1530a50c81e0e1d0a63e9b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 21 09:55:12 2019 +0100 Remove unused methods. --- .../torproject/descriptor/impl/ParseHelper.java | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 53f011c..cd73278 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -223,26 +223,6 @@ public class ParseHelper { ZoneOffset.UTC); } - protected static long parseDateAtIndex(String line, String[] parts, - int dateIndex) throws DescriptorParseException { - if (dateIndex >= parts.length) { - throw new DescriptorParseException("Line '" + line + "' does not " - + "contain a date at the expected position."); - } - long result = -1L; - try { - DateFormat dateFormat = getDateFormat("yyyy-MM-dd"); - result = dateFormat.parse(parts[dateIndex]).getTime(); - } catch (ParseException e) { - /* Leave result at -1L. */ - } - if (result < 0L || result / 1000L > (long) Integer.MAX_VALUE) { - throw new DescriptorParseException("Illegal date format in line '" - + line + "'."); - } - return result; - } - protected static String parseTwentyByteHexString(String line, String hexString) throws DescriptorParseException { return parseHexString(line, hexString, 40); @@ -330,18 +310,11 @@ public class ParseHelper { protected static void verifyThirtyTwoByteBase64String(String line, String base64String) throws DescriptorParseException { - convertThirtyTwoByteBase64StringToHex(line, base64String); - } - - private static String convertThirtyTwoByteBase64StringToHex(String line, - String base64String) throws DescriptorParseException { if (!thirtyTwoByteBase64Pattern.matcher(base64String).matches()) { throw new DescriptorParseException("'" + base64String + "' in line '" + line + "' is not a valid base64-encoded " + "32-byte value."); } - return Hex.encodeHexString(Base64.decodeBase64(base64String + "=")) - .toUpperCase(); } protected static String parseCommaSeparatedKeyIntegerValueList(

1 0

[metrics-lib/release] Update copyright to 2020.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 0db8a5787ce3ff2cd31be957592c1ce0e38e12ce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:29:57 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- src/main/java/org/torproject/descriptor/BandwidthFile.java | 2 +- src/main/java/org/torproject/descriptor/BandwidthHistory.java | 2 +- src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java | 2 +- src/main/java/org/torproject/descriptor/BridgePoolAssignment.java | 2 +- src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/BridgedbMetrics.java | 2 +- src/main/java/org/torproject/descriptor/Descriptor.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorCollector.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorParseException.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorParser.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorReader.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java | 2 +- src/main/java/org/torproject/descriptor/DirSourceEntry.java | 2 +- src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java | 2 +- src/main/java/org/torproject/descriptor/DirectorySignature.java | 2 +- src/main/java/org/torproject/descriptor/ExitList.java | 2 +- src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/LogDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/Method.java | 2 +- src/main/java/org/torproject/descriptor/Microdescriptor.java | 2 +- src/main/java/org/torproject/descriptor/NetworkStatusEntry.java | 2 +- src/main/java/org/torproject/descriptor/RelayDirectory.java | 2 +- src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/RelayNetworkStatus.java | 2 +- .../java/org/torproject/descriptor/RelayNetworkStatusConsensus.java | 2 +- src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java | 2 +- src/main/java/org/torproject/descriptor/RelayServerDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/RouterStatusEntry.java | 2 +- src/main/java/org/torproject/descriptor/ServerDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/SnowflakeStats.java | 2 +- src/main/java/org/torproject/descriptor/TorperfResult.java | 2 +- src/main/java/org/torproject/descriptor/UnparseableDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/WebServerAccessLog.java | 2 +- src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java | 2 +- .../org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java | 2 +- .../java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java | 2 +- .../org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java | 2 +- .../java/org/torproject/descriptor/impl/DirectorySignatureImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ExitListImpl.java | 2 +- .../java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/KeyValueMap.java | 2 +- src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 2 +- src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java | 2 +- .../org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java | 2 +- .../org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java | 2 +- .../java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 2 +- .../java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 2 +- .../java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java | 2 +- .../java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/index/DescriptorIndexCollector.java | 2 +- src/main/java/org/torproject/descriptor/index/DirectoryNode.java | 2 +- src/main/java/org/torproject/descriptor/index/FileNode.java | 2 +- src/main/java/org/torproject/descriptor/index/IndexNode.java | 2 +- src/main/java/org/torproject/descriptor/index/package-info.java | 2 +- src/main/java/org/torproject/descriptor/internal/FileType.java | 2 +- src/main/java/org/torproject/descriptor/internal/package-info.java | 2 +- src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java | 2 +- .../java/org/torproject/descriptor/log/InternalWebServerAccessLog.java | 2 +- src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java | 2 +- src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java | 2 +- src/main/java/org/torproject/descriptor/log/package-info.java | 2 +- src/main/java/org/torproject/descriptor/package-info.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/resources/examples/ConsensusWeightByVersion.java | 2 +- src/main/resources/examples/DownloadConsensuses.java | 2 +- src/main/resources/examples/PluggableTransports.java | 2 +- .../java/org/torproject/descriptor/DescriptorSourceFactoryTest.java | 2 +- src/test/java/org/torproject/descriptor/DescriptorTest.java | 2 +- .../java/org/torproject/descriptor/DummyCollectorImplementation.java | 2 +- src/test/java/org/torproject/descriptor/DummyParserImplementation.java | 2 +- src/test/java/org/torproject/descriptor/DummyReaderImplementation.java | 2 +- .../java/org/torproject/descriptor/benchmark/MeasurePerformance.java | 2 +- src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java | 2 +- .../java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java | 2 +- src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/DescriptorParserImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java | 2 +- .../org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java | 2 +- .../torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java | 2 +- .../org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/TestDescriptor.java | 2 +- src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java | 2 +- src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java | 2 +- src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java | 2 +- .../org/torproject/descriptor/index/DescriptorIndexCollectorTest.java | 2 +- src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java | 2 +- src/test/java/org/torproject/descriptor/index/FileNodeTest.java | 2 +- src/test/java/org/torproject/descriptor/index/IndexNodeTest.java | 2 +- src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java | 2 +- .../java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java | 2 +- src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java | 2 +- src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java | 2 +- 119 files changed, 119 insertions(+), 119 deletions(-) diff --git a/LICENSE b/LICENSE index 97665c8..4c108b6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011--2017 The Tor Project +Copyright 2011--2020 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/main/java/org/torproject/descriptor/BandwidthFile.java b/src/main/java/org/torproject/descriptor/BandwidthFile.java index 34b9414..bbc4056 100644 --- a/src/main/java/org/torproject/descriptor/BandwidthFile.java +++ b/src/main/java/org/torproject/descriptor/BandwidthFile.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BandwidthHistory.java b/src/main/java/org/torproject/descriptor/BandwidthHistory.java index 0389fe9..7548185 100644 --- a/src/main/java/org/torproject/descriptor/BandwidthHistory.java +++ b/src/main/java/org/torproject/descriptor/BandwidthHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java index d2fa37d..07016cb 100644 --- a/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java b/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java index 8afb827..9c78b77 100644 --- a/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java +++ b/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java b/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java index f42ea15..92f4eec 100644 --- a/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java +++ b/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java b/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java index 47ee9f4..13f3c03 100644 --- a/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgedbMetrics.java b/src/main/java/org/torproject/descriptor/BridgedbMetrics.java index 68d9d4f..6dbe06d 100644 --- a/src/main/java/org/torproject/descriptor/BridgedbMetrics.java +++ b/src/main/java/org/torproject/descriptor/BridgedbMetrics.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/Descriptor.java b/src/main/java/org/torproject/descriptor/Descriptor.java index d745dce..5d2820c 100644 --- a/src/main/java/org/torproject/descriptor/Descriptor.java +++ b/src/main/java/org/torproject/descriptor/Descriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorCollector.java b/src/main/java/org/torproject/descriptor/DescriptorCollector.java index 823a62d..0f351d1 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorCollector.java +++ b/src/main/java/org/torproject/descriptor/DescriptorCollector.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorParseException.java b/src/main/java/org/torproject/descriptor/DescriptorParseException.java index 7594b45..5c810aa 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParseException.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParseException.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorParser.java b/src/main/java/org/torproject/descriptor/DescriptorParser.java index 159af8d..401181a 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParser.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorReader.java b/src/main/java/org/torproject/descriptor/DescriptorReader.java index 7eab1e6..be94254 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorReader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorReader.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index 80ea524..97f93cc 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DirSourceEntry.java b/src/main/java/org/torproject/descriptor/DirSourceEntry.java index 41f5c05..daac9e4 100644 --- a/src/main/java/org/torproject/descriptor/DirSourceEntry.java +++ b/src/main/java/org/torproject/descriptor/DirSourceEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java b/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java index 3b44f9f..c0f616e 100644 --- a/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java +++ b/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DirectorySignature.java b/src/main/java/org/torproject/descriptor/DirectorySignature.java index 2522fd7..bc720a6 100644 --- a/src/main/java/org/torproject/descriptor/DirectorySignature.java +++ b/src/main/java/org/torproject/descriptor/DirectorySignature.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ExitList.java b/src/main/java/org/torproject/descriptor/ExitList.java index a631f3c..563ae4f 100644 --- a/src/main/java/org/torproject/descriptor/ExitList.java +++ b/src/main/java/org/torproject/descriptor/ExitList.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java index 812d6aa..a2c893b 100644 --- a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/LogDescriptor.java b/src/main/java/org/torproject/descriptor/LogDescriptor.java index 5828441..17751a7 100644 --- a/src/main/java/org/torproject/descriptor/LogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/LogDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/Method.java b/src/main/java/org/torproject/descriptor/Method.java index 771fb10..42c6819 100644 --- a/src/main/java/org/torproject/descriptor/Method.java +++ b/src/main/java/org/torproject/descriptor/Method.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/Microdescriptor.java b/src/main/java/org/torproject/descriptor/Microdescriptor.java index 8a33a3b..feaf00b 100644 --- a/src/main/java/org/torproject/descriptor/Microdescriptor.java +++ b/src/main/java/org/torproject/descriptor/Microdescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java b/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java index e602a04..5a2cae1 100644 --- a/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java +++ b/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayDirectory.java b/src/main/java/org/torproject/descriptor/RelayDirectory.java index e2a5dca..61fd25d 100644 --- a/src/main/java/org/torproject/descriptor/RelayDirectory.java +++ b/src/main/java/org/torproject/descriptor/RelayDirectory.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java index 133d9e3..c779065 100644 --- a/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java index 90f050b..9ea54a5 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java index e8ec89f..124bf7f 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java index 9514765..5ed31b3 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java b/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java index 2e8118a..ea73ef8 100644 --- a/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RouterStatusEntry.java b/src/main/java/org/torproject/descriptor/RouterStatusEntry.java index 8b96c52..538157d 100644 --- a/src/main/java/org/torproject/descriptor/RouterStatusEntry.java +++ b/src/main/java/org/torproject/descriptor/RouterStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ServerDescriptor.java b/src/main/java/org/torproject/descriptor/ServerDescriptor.java index 9ecd46b..2e0ecbd 100644 --- a/src/main/java/org/torproject/descriptor/ServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/SnowflakeStats.java b/src/main/java/org/torproject/descriptor/SnowflakeStats.java index 5c464df..2fe78df 100644 --- a/src/main/java/org/torproject/descriptor/SnowflakeStats.java +++ b/src/main/java/org/torproject/descriptor/SnowflakeStats.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/TorperfResult.java b/src/main/java/org/torproject/descriptor/TorperfResult.java index add36ff..da48e0b 100644 --- a/src/main/java/org/torproject/descriptor/TorperfResult.java +++ b/src/main/java/org/torproject/descriptor/TorperfResult.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java b/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java index 691df29..7a93524 100644 --- a/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java +++ b/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/WebServerAccessLog.java b/src/main/java/org/torproject/descriptor/WebServerAccessLog.java index ac50b15..f157321 100644 --- a/src/main/java/org/torproject/descriptor/WebServerAccessLog.java +++ b/src/main/java/org/torproject/descriptor/WebServerAccessLog.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java index 657b90e..f9198a4 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index ec6de2d..00a7732 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java index dbd518e..c16a24d 100644 --- a/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java index 0ca4cfd..2865cf4 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index c3e7cb4..d3d546b 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index 80e126d..2fdad0b 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java index f2de3f2..4fcd548 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java index f683067..431ab12 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index b6dbf74..4b380bc 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 25494f4..0a2444b 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 207baca..08c82ec 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java index a00ffa1..1e98b5a 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 8ae1ed7..1029c9b 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java index 248d546..8f2bbb9 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java index ba203e2..f7f91df 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java index b1ffa67..fd312d2 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 17ac6e5..5880b0e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java index 6cb4680..23c4aa5 100644 --- a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java +++ b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java index 47028bd..fe965e5 100644 --- a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index e6a78f6..5c65482 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index b763f30..b994016 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index cd73278..dcf2a0e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 55303d2..94d256c 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java index e24645f..fd56252 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 66b8eaa..79f0756 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 9860df0..0fba932 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 8e83b83..56a9e21 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java index 0d1b7a0..c920ac0 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java index 6678ce7..f5d31a1 100644 --- a/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index f33e2e8..aac4bcc 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java index daaa933..6552325 100644 --- a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 83e9491..b883012 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java index eca29c9..fe10237 100644 --- a/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index c472da0..b4aae59 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java index 9ed5784..c58b377 100644 --- a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java +++ b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/FileNode.java b/src/main/java/org/torproject/descriptor/index/FileNode.java index f505f16..6c35146 100644 --- a/src/main/java/org/torproject/descriptor/index/FileNode.java +++ b/src/main/java/org/torproject/descriptor/index/FileNode.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 9136b65..ce3faa4 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/package-info.java b/src/main/java/org/torproject/descriptor/index/package-info.java index 021cbea..4734ff6 100644 --- a/src/main/java/org/torproject/descriptor/index/package-info.java +++ b/src/main/java/org/torproject/descriptor/index/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/java/org/torproject/descriptor/internal/FileType.java b/src/main/java/org/torproject/descriptor/internal/FileType.java index 8f42624..439055a 100644 --- a/src/main/java/org/torproject/descriptor/internal/FileType.java +++ b/src/main/java/org/torproject/descriptor/internal/FileType.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.internal; diff --git a/src/main/java/org/torproject/descriptor/internal/package-info.java b/src/main/java/org/torproject/descriptor/internal/package-info.java index b845921..024f75f 100644 --- a/src/main/java/org/torproject/descriptor/internal/package-info.java +++ b/src/main/java/org/torproject/descriptor/internal/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java index 558f02a..82a5554 100644 --- a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java b/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java index 0c96e06..267554f 100644 --- a/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java +++ b/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java index b730465..a253c50 100644 --- a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java index 27ec355..188f5b0 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java index a4acc5f..3e19a75 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/package-info.java b/src/main/java/org/torproject/descriptor/log/package-info.java index 68bcfa1..141d7fa 100644 --- a/src/main/java/org/torproject/descriptor/log/package-info.java +++ b/src/main/java/org/torproject/descriptor/log/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/java/org/torproject/descriptor/package-info.java b/src/main/java/org/torproject/descriptor/package-info.java index d844d40..e6f4391 100644 --- a/src/main/java/org/torproject/descriptor/package-info.java +++ b/src/main/java/org/torproject/descriptor/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index d301e25..ebdc1de 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/resources/examples/ConsensusWeightByVersion.java b/src/main/resources/examples/ConsensusWeightByVersion.java index 5026999..d3b81e7 100644 --- a/src/main/resources/examples/ConsensusWeightByVersion.java +++ b/src/main/resources/examples/ConsensusWeightByVersion.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ import org.torproject.descriptor.*; diff --git a/src/main/resources/examples/DownloadConsensuses.java b/src/main/resources/examples/DownloadConsensuses.java index 359c76c..10ea5a7 100644 --- a/src/main/resources/examples/DownloadConsensuses.java +++ b/src/main/resources/examples/DownloadConsensuses.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ import org.torproject.descriptor.*; diff --git a/src/main/resources/examples/PluggableTransports.java b/src/main/resources/examples/PluggableTransports.java index 102adf0..cf96231 100644 --- a/src/main/resources/examples/PluggableTransports.java +++ b/src/main/resources/examples/PluggableTransports.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ import org.torproject.descriptor.*; diff --git a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java index de906db..6335145 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DescriptorTest.java b/src/test/java/org/torproject/descriptor/DescriptorTest.java index 719d16b..950422d 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java b/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java index 219bd2a..013ed82 100644 --- a/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java +++ b/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DummyParserImplementation.java b/src/test/java/org/torproject/descriptor/DummyParserImplementation.java index 54fc254..c28b7b4 100644 --- a/src/test/java/org/torproject/descriptor/DummyParserImplementation.java +++ b/src/test/java/org/torproject/descriptor/DummyParserImplementation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java b/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java index f9d9f3d..eb6aa33 100644 --- a/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java +++ b/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java b/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java index 80d9792..ce5d393 100644 --- a/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java +++ b/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.benchmark; diff --git a/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java b/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java index d19b7e7..9286fdb 100644 --- a/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java index fd26eec..e586650 100644 --- a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java b/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java index 8c0e2d5..95405d9 100644 --- a/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java b/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java index 1c0fa81..f10be11 100644 --- a/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java +++ b/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java index a0a32cf..a2a3e6a 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java index 00b99a4..033daea 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java index 01d190b..ceee1f1 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java index 44a868b..503a8bc 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 4aa2008..9750046 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java index 890071a..128d39a 100644 --- a/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index b4c7d8a..5cbea00 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java index 80d46da..cb28d33 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index 9418a9c..6735b61 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 8e4424c..97456d6 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java index 0378fbc..4051b74 100644 --- a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java index 9748f00..34ba78a 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java index a596c9d..0cafce0 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2019 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java b/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java index 9649bb0..a5d3c72 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java +++ b/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index b56490a..0e76c97 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index 2ac3359..967bc64 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java index eff1edf..37e5d55 100644 --- a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/index/FileNodeTest.java b/src/test/java/org/torproject/descriptor/index/FileNodeTest.java index 0fed293..7cae4cf 100644 --- a/src/test/java/org/torproject/descriptor/index/FileNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/FileNodeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java index 6695018..fd84340 100644 --- a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java index 609f6e5..875f6d8 100644 --- a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java index ec23b61..6cc5e43 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java index b64c4df..74a40a8 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java index 8108720..32a48ee 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log;

1 0

[metrics-lib/master] Update to latest metrics-base.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 6408bd9a85890f06a74f5f077e49dffe33acc36e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 22:45:39 2020 +0100 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index eb16cb3..264e498 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit eb16cb359db41722e6089bafb1e26808df4338df +Subproject commit 264e498f54a20f7d299daaf2533d043f880e6a8b

1 0

[metrics-lib/master] Prepare for 2.10.0 release.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit abcbd7c7a6b7a17d012cf1c8ac077fd73c9479e4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 22:09:27 2020 +0100 Prepare for 2.10.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d3ab12..5671a86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.10.0 - 2019-1?-?? +# Changes in version 2.10.0 - 2020-01-15 * Medium changes - Parse three newly added lines in snowflake statistics files. diff --git a/build.xml b/build.xml index 9c3869a..bf615f7 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.1-dev" /> + <property name="release.version" value="2.10.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Bump version to 2.10.0-dev.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 4581035acf517695944442d143c5c6d931ae0022 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 22:45:16 2020 +0100 Bump version to 2.10.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5671a86..bb8bb89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.1?.? - 2020-0?-?? + + # Changes in version 2.10.0 - 2020-01-15 * Medium changes diff --git a/build.xml b/build.xml index bf615f7..fcf737b 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.10.0" /> + <property name="release.version" value="2.10.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-web/master] Update copyright to 2020.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit a59139b8460c6c77f36370fe35164b70a84f5d68 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:56:00 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- src/main/java/org/torproject/metrics/stats/advbwdist/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/bridgedb/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/bwhist/Main.java | 2 +- .../metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java | 2 +- src/main/java/org/torproject/metrics/stats/bwhist/Writer.java | 2 +- src/main/java/org/torproject/metrics/stats/clients/Database.java | 2 +- src/main/java/org/torproject/metrics/stats/clients/Detector.java | 2 +- src/main/java/org/torproject/metrics/stats/clients/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/clients/Writer.java | 2 +- src/main/java/org/torproject/metrics/stats/collectdescs/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/connbidirect/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java | 2 +- .../org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Document.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java | 2 +- .../org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Parser.java | 2 +- .../java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java | 2 +- src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java | 2 +- src/main/java/org/torproject/metrics/stats/servers/Database.java | 2 +- .../java/org/torproject/metrics/stats/servers/Ipv6NetworkStatus.java | 2 +- .../java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptor.java | 2 +- src/main/java/org/torproject/metrics/stats/servers/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/servers/Parser.java | 2 +- src/main/java/org/torproject/metrics/stats/servers/Writer.java | 2 +- src/main/java/org/torproject/metrics/stats/totalcw/Database.java | 2 +- src/main/java/org/torproject/metrics/stats/totalcw/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java | 2 +- src/main/java/org/torproject/metrics/stats/totalcw/Parser.java | 2 +- .../org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java | 2 +- src/main/java/org/torproject/metrics/stats/totalcw/Writer.java | 2 +- src/main/java/org/torproject/metrics/stats/webstats/Main.java | 2 +- src/main/java/org/torproject/metrics/web/AboutServlet.java | 2 +- src/main/java/org/torproject/metrics/web/BubblesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/Category.java | 2 +- src/main/java/org/torproject/metrics/web/CollecTorServlet.java | 2 +- .../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 2 +- src/main/java/org/torproject/metrics/web/ContentProvider.java | 2 +- src/main/java/org/torproject/metrics/web/Countries.java | 2 +- src/main/java/org/torproject/metrics/web/DataSourceServlet.java | 2 +- src/main/java/org/torproject/metrics/web/DevelopmentServlet.java | 2 +- src/main/java/org/torproject/metrics/web/DirectoryListing.java | 2 +- src/main/java/org/torproject/metrics/web/ErrorServlet.java | 2 +- src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java | 2 +- src/main/java/org/torproject/metrics/web/GlossaryServlet.java | 2 +- src/main/java/org/torproject/metrics/web/GraphImageServlet.java | 2 +- src/main/java/org/torproject/metrics/web/GraphParameterChecker.java | 2 +- src/main/java/org/torproject/metrics/web/GraphServlet.java | 2 +- src/main/java/org/torproject/metrics/web/IndexServlet.java | 2 +- src/main/java/org/torproject/metrics/web/LinkServlet.java | 2 +- src/main/java/org/torproject/metrics/web/Metric.java | 2 +- src/main/java/org/torproject/metrics/web/MetricServlet.java | 2 +- src/main/java/org/torproject/metrics/web/MetricsGuidelinesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/MetricsLibServlet.java | 2 +- src/main/java/org/torproject/metrics/web/News.java | 2 +- src/main/java/org/torproject/metrics/web/NewsServlet.java | 2 +- src/main/java/org/torproject/metrics/web/OnionooServlet.java | 2 +- src/main/java/org/torproject/metrics/web/OperationServlet.java | 2 +- src/main/java/org/torproject/metrics/web/RObject.java | 2 +- src/main/java/org/torproject/metrics/web/RObjectGenerator.java | 2 +- src/main/java/org/torproject/metrics/web/RelaySearchServlet.java | 2 +- .../java/org/torproject/metrics/web/ReproducibleMetricsServlet.java | 2 +- src/main/java/org/torproject/metrics/web/ResearchServlet.java | 2 +- src/main/java/org/torproject/metrics/web/ServerMain.java | 2 +- src/main/java/org/torproject/metrics/web/ServicesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/SourcesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/StatsServlet.java | 2 +- src/main/java/org/torproject/metrics/web/TableParameterChecker.java | 2 +- src/main/java/org/torproject/metrics/web/TableServlet.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/sql/bwhist/tordir.sql | 2 +- src/main/sql/clients/init-userstats.sql | 2 +- src/main/sql/onionperf/init-onionperf.sql | 2 +- src/main/sql/servers/init-ipv6servers.sql | 2 +- src/main/sql/totalcw/init-totalcw.sql | 2 +- src/main/sql/webstats/init-webstats.sql | 2 +- src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java | 2 +- src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java | 2 +- .../org/torproject/metrics/stats/servers/Ipv6NetworkStatusTest.java | 2 +- .../org/torproject/metrics/stats/servers/Ipv6ServerDescriptorTest.java | 2 +- .../torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusTest.java | 2 +- src/test/java/org/torproject/metrics/web/DirectoryListingTest.java | 2 +- src/test/sql/servers/test-ipv6servers.sql | 2 +- src/test/sql/userstats/test-userstats.sql | 2 +- 88 files changed, 88 insertions(+), 88 deletions(-) diff --git a/LICENSE b/LICENSE index 977e210..9c7b3ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010--2017 The Tor Project +Copyright 2010--2020 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java index da335ce..1e6bd0e 100644 --- a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.advbwdist; diff --git a/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java b/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java index 16c3c21..989c695 100644 --- a/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java +++ b/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.bridgedb; diff --git a/src/main/java/org/torproject/metrics/stats/bwhist/Main.java b/src/main/java/org/torproject/metrics/stats/bwhist/Main.java index 30358f2..4e92f1c 100644 --- a/src/main/java/org/torproject/metrics/stats/bwhist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/bwhist/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.bwhist; diff --git a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java index 457517f..09e7b67 100644 --- a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.bwhist; diff --git a/src/main/java/org/torproject/metrics/stats/bwhist/Writer.java b/src/main/java/org/torproject/metrics/stats/bwhist/Writer.java index 1ac1fd9..e368b4f 100644 --- a/src/main/java/org/torproject/metrics/stats/bwhist/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/bwhist/Writer.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.bwhist; diff --git a/src/main/java/org/torproject/metrics/stats/clients/Database.java b/src/main/java/org/torproject/metrics/stats/clients/Database.java index abe363c..3d8d63d 100644 --- a/src/main/java/org/torproject/metrics/stats/clients/Database.java +++ b/src/main/java/org/torproject/metrics/stats/clients/Database.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.clients; diff --git a/src/main/java/org/torproject/metrics/stats/clients/Detector.java b/src/main/java/org/torproject/metrics/stats/clients/Detector.java index cceac5e..c12749b 100644 --- a/src/main/java/org/torproject/metrics/stats/clients/Detector.java +++ b/src/main/java/org/torproject/metrics/stats/clients/Detector.java @@ -35,7 +35,7 @@ * (Clear BSD license: * http://labs.metacarta.com/license-explanation.html#license) * - * Copyright 2018 The Tor Project + * Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.clients; diff --git a/src/main/java/org/torproject/metrics/stats/clients/Main.java b/src/main/java/org/torproject/metrics/stats/clients/Main.java index 2f22f72..d89a82a 100644 --- a/src/main/java/org/torproject/metrics/stats/clients/Main.java +++ b/src/main/java/org/torproject/metrics/stats/clients/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.clients; diff --git a/src/main/java/org/torproject/metrics/stats/clients/Writer.java b/src/main/java/org/torproject/metrics/stats/clients/Writer.java index ed10bf1..825b4c5 100644 --- a/src/main/java/org/torproject/metrics/stats/clients/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/clients/Writer.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.clients; diff --git a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java index 26911ab..ca7a9b3 100644 --- a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java +++ b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.collectdescs; diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java index c7fefee..5e71534 100644 --- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.connbidirect; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java index 12a89a3..3ab1c1d 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java index 835ac6f..4858588 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java index ade7024..2fa866f 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Document.java b/src/main/java/org/torproject/metrics/stats/hidserv/Document.java index 5711a53..e383219 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Document.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Document.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java index 9061aa3..1cfcf08 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java index eb66c7a..ba42317 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java index 7a44425..6bb47b8 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Main.java b/src/main/java/org/torproject/metrics/stats/hidserv/Main.java index 5076353..1711dbb 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Main.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java index 57a0d5f..46a6607 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java b/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java index 58abbf7..5b79a65 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java index f5e1b85..8374514 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/servers/Database.java b/src/main/java/org/torproject/metrics/stats/servers/Database.java index 562ae34..fb3fdf5 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Database.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Database.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/main/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatus.java b/src/main/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatus.java index 2f40854..f606894 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatus.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/main/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptor.java b/src/main/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptor.java index 4450a3c..4cc9e0f 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptor.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/main/java/org/torproject/metrics/stats/servers/Main.java b/src/main/java/org/torproject/metrics/stats/servers/Main.java index 30010a2..1fc853f 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Main.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/main/java/org/torproject/metrics/stats/servers/Parser.java b/src/main/java/org/torproject/metrics/stats/servers/Parser.java index 65055f9..19ea53d 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Parser.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/main/java/org/torproject/metrics/stats/servers/Writer.java b/src/main/java/org/torproject/metrics/stats/servers/Writer.java index 5ff1858..c8adc7f 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Writer.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/Database.java b/src/main/java/org/torproject/metrics/stats/totalcw/Database.java index eeb24a0..a35099f 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/Database.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/Database.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/Main.java b/src/main/java/org/torproject/metrics/stats/totalcw/Main.java index 54296be..3be41f9 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/Main.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java b/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java index 60d03a5..c7b6238 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/OutputLine.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java b/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java index 72a9aad..03804ce 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java b/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java index 3f8822d..0cf394a 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/Writer.java b/src/main/java/org/torproject/metrics/stats/totalcw/Writer.java index 6688eae..7af0f09 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/Writer.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/main/java/org/torproject/metrics/stats/webstats/Main.java b/src/main/java/org/torproject/metrics/stats/webstats/Main.java index 87b643a..f581c8a 100644 --- a/src/main/java/org/torproject/metrics/stats/webstats/Main.java +++ b/src/main/java/org/torproject/metrics/stats/webstats/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.webstats; diff --git a/src/main/java/org/torproject/metrics/web/AboutServlet.java b/src/main/java/org/torproject/metrics/web/AboutServlet.java index db39120..62f9d5e 100644 --- a/src/main/java/org/torproject/metrics/web/AboutServlet.java +++ b/src/main/java/org/torproject/metrics/web/AboutServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/BubblesServlet.java b/src/main/java/org/torproject/metrics/web/BubblesServlet.java index d59c0f5..7337ec3 100644 --- a/src/main/java/org/torproject/metrics/web/BubblesServlet.java +++ b/src/main/java/org/torproject/metrics/web/BubblesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/Category.java b/src/main/java/org/torproject/metrics/web/Category.java index 5b0185c..da6a664 100644 --- a/src/main/java/org/torproject/metrics/web/Category.java +++ b/src/main/java/org/torproject/metrics/web/Category.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/CollecTorServlet.java b/src/main/java/org/torproject/metrics/web/CollecTorServlet.java index 687afb8..b9661b9 100644 --- a/src/main/java/org/torproject/metrics/web/CollecTorServlet.java +++ b/src/main/java/org/torproject/metrics/web/CollecTorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java index 4e20ec5..8d3a018 100644 --- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java +++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ContentProvider.java b/src/main/java/org/torproject/metrics/web/ContentProvider.java index d5394cd..2e9a2f6 100644 --- a/src/main/java/org/torproject/metrics/web/ContentProvider.java +++ b/src/main/java/org/torproject/metrics/web/ContentProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/Countries.java b/src/main/java/org/torproject/metrics/web/Countries.java index a2d3cea..92dce3b 100644 --- a/src/main/java/org/torproject/metrics/web/Countries.java +++ b/src/main/java/org/torproject/metrics/web/Countries.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/DataSourceServlet.java b/src/main/java/org/torproject/metrics/web/DataSourceServlet.java index f5e83b4..f5c20f0 100644 --- a/src/main/java/org/torproject/metrics/web/DataSourceServlet.java +++ b/src/main/java/org/torproject/metrics/web/DataSourceServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java index 540273d..4862c3d 100644 --- a/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java +++ b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/DirectoryListing.java b/src/main/java/org/torproject/metrics/web/DirectoryListing.java index 1bb09c2..09f2aaa 100644 --- a/src/main/java/org/torproject/metrics/web/DirectoryListing.java +++ b/src/main/java/org/torproject/metrics/web/DirectoryListing.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ErrorServlet.java b/src/main/java/org/torproject/metrics/web/ErrorServlet.java index 49fbd68..0e5debc 100644 --- a/src/main/java/org/torproject/metrics/web/ErrorServlet.java +++ b/src/main/java/org/torproject/metrics/web/ErrorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java b/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java index b80b805..baca6e9 100644 --- a/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java +++ b/src/main/java/org/torproject/metrics/web/ExoneraTorWrapperServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/GlossaryServlet.java b/src/main/java/org/torproject/metrics/web/GlossaryServlet.java index 7f199c1..4f9261b 100644 --- a/src/main/java/org/torproject/metrics/web/GlossaryServlet.java +++ b/src/main/java/org/torproject/metrics/web/GlossaryServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/GraphImageServlet.java b/src/main/java/org/torproject/metrics/web/GraphImageServlet.java index b8b2fbc..28638f4 100644 --- a/src/main/java/org/torproject/metrics/web/GraphImageServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphImageServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java b/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java index ac642e9..236a190 100644 --- a/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/GraphServlet.java b/src/main/java/org/torproject/metrics/web/GraphServlet.java index 17d9309..507ae3b 100644 --- a/src/main/java/org/torproject/metrics/web/GraphServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/IndexServlet.java b/src/main/java/org/torproject/metrics/web/IndexServlet.java index 0bde0ae..c90feb7 100644 --- a/src/main/java/org/torproject/metrics/web/IndexServlet.java +++ b/src/main/java/org/torproject/metrics/web/IndexServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/LinkServlet.java b/src/main/java/org/torproject/metrics/web/LinkServlet.java index 7c5cb02..d96bc97 100644 --- a/src/main/java/org/torproject/metrics/web/LinkServlet.java +++ b/src/main/java/org/torproject/metrics/web/LinkServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/Metric.java b/src/main/java/org/torproject/metrics/web/Metric.java index a797d01..4611f45 100644 --- a/src/main/java/org/torproject/metrics/web/Metric.java +++ b/src/main/java/org/torproject/metrics/web/Metric.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/MetricServlet.java b/src/main/java/org/torproject/metrics/web/MetricServlet.java index 353af63..96d1399 100644 --- a/src/main/java/org/torproject/metrics/web/MetricServlet.java +++ b/src/main/java/org/torproject/metrics/web/MetricServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/MetricsGuidelinesServlet.java b/src/main/java/org/torproject/metrics/web/MetricsGuidelinesServlet.java index 41dae13..90cb082 100644 --- a/src/main/java/org/torproject/metrics/web/MetricsGuidelinesServlet.java +++ b/src/main/java/org/torproject/metrics/web/MetricsGuidelinesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java b/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java index b82ccf8..425f171 100644 --- a/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java +++ b/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/News.java b/src/main/java/org/torproject/metrics/web/News.java index bd80ad4..3ac1d79 100644 --- a/src/main/java/org/torproject/metrics/web/News.java +++ b/src/main/java/org/torproject/metrics/web/News.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java index 4175659..c91233a 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/OnionooServlet.java b/src/main/java/org/torproject/metrics/web/OnionooServlet.java index 65fbe58..f68fe59 100644 --- a/src/main/java/org/torproject/metrics/web/OnionooServlet.java +++ b/src/main/java/org/torproject/metrics/web/OnionooServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/OperationServlet.java b/src/main/java/org/torproject/metrics/web/OperationServlet.java index bc13648..03e5c1e 100644 --- a/src/main/java/org/torproject/metrics/web/OperationServlet.java +++ b/src/main/java/org/torproject/metrics/web/OperationServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/RObject.java b/src/main/java/org/torproject/metrics/web/RObject.java index 3e38dd0..a0b28a3 100644 --- a/src/main/java/org/torproject/metrics/web/RObject.java +++ b/src/main/java/org/torproject/metrics/web/RObject.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java index 6a142e8..3e3ced6 100644 --- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java b/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java index 101b99c..377ca66 100644 --- a/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java +++ b/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ReproducibleMetricsServlet.java b/src/main/java/org/torproject/metrics/web/ReproducibleMetricsServlet.java index 813ec6c..6e745b5 100644 --- a/src/main/java/org/torproject/metrics/web/ReproducibleMetricsServlet.java +++ b/src/main/java/org/torproject/metrics/web/ReproducibleMetricsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ResearchServlet.java b/src/main/java/org/torproject/metrics/web/ResearchServlet.java index 2c3cb09..3e76a2a 100644 --- a/src/main/java/org/torproject/metrics/web/ResearchServlet.java +++ b/src/main/java/org/torproject/metrics/web/ResearchServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ServerMain.java b/src/main/java/org/torproject/metrics/web/ServerMain.java index d45090d..db01bc5 100644 --- a/src/main/java/org/torproject/metrics/web/ServerMain.java +++ b/src/main/java/org/torproject/metrics/web/ServerMain.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ServicesServlet.java b/src/main/java/org/torproject/metrics/web/ServicesServlet.java index df4fe1e..f9d4a37 100644 --- a/src/main/java/org/torproject/metrics/web/ServicesServlet.java +++ b/src/main/java/org/torproject/metrics/web/ServicesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/SourcesServlet.java b/src/main/java/org/torproject/metrics/web/SourcesServlet.java index d1296cc..18c9295 100644 --- a/src/main/java/org/torproject/metrics/web/SourcesServlet.java +++ b/src/main/java/org/torproject/metrics/web/SourcesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/StatsServlet.java b/src/main/java/org/torproject/metrics/web/StatsServlet.java index 79b2ebc..cc98c66 100644 --- a/src/main/java/org/torproject/metrics/web/StatsServlet.java +++ b/src/main/java/org/torproject/metrics/web/StatsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/TableParameterChecker.java b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java index a919097..8c3b4fa 100644 --- a/src/main/java/org/torproject/metrics/web/TableParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java index 84f46ee..c3d8d6e 100644 --- a/src/main/java/org/torproject/metrics/web/TableServlet.java +++ b/src/main/java/org/torproject/metrics/web/TableServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index 407bdea..ad7e395 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/sql/bwhist/tordir.sql b/src/main/sql/bwhist/tordir.sql index 047f18e..e11bbc6 100644 --- a/src/main/sql/bwhist/tordir.sql +++ b/src/main/sql/bwhist/tordir.sql @@ -1,4 +1,4 @@ --- Copyright 2010, 2018 The Tor Project +-- Copyright 2010, 2018--2020 The Tor Project -- See LICENSE for licensing information CREATE LANGUAGE plpgsql; diff --git a/src/main/sql/clients/init-userstats.sql b/src/main/sql/clients/init-userstats.sql index 467f8aa..eaa05b3 100644 --- a/src/main/sql/clients/init-userstats.sql +++ b/src/main/sql/clients/init-userstats.sql @@ -1,4 +1,4 @@ --- Copyright 2013--2018 The Tor Project +-- Copyright 2013--2020 The Tor Project -- See LICENSE for licensing information -- Use enum types for dimensions that may only change if we write new code diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index 01bfef1..42fc4a2 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -1,4 +1,4 @@ --- Copyright 2017--2018 The Tor Project +-- Copyright 2017--2020 The Tor Project -- See LICENSE for licensing information CREATE TABLE IF NOT EXISTS measurements ( diff --git a/src/main/sql/servers/init-ipv6servers.sql b/src/main/sql/servers/init-ipv6servers.sql index c94a19d..98a5421 100644 --- a/src/main/sql/servers/init-ipv6servers.sql +++ b/src/main/sql/servers/init-ipv6servers.sql @@ -1,4 +1,4 @@ --- Copyright 2017--2018 The Tor Project +-- Copyright 2017--2020 The Tor Project -- See LICENSE for licensing information -- Table of all known flags, to match flag strings to bit positions in the flags diff --git a/src/main/sql/totalcw/init-totalcw.sql b/src/main/sql/totalcw/init-totalcw.sql index 62778d4..6785633 100644 --- a/src/main/sql/totalcw/init-totalcw.sql +++ b/src/main/sql/totalcw/init-totalcw.sql @@ -1,4 +1,4 @@ --- Copyright 2018 The Tor Project +-- Copyright 2018--2020 The Tor Project -- See LICENSE for licensing information -- Table of v3 authorities that stores nicknames and identity fingerprints and diff --git a/src/main/sql/webstats/init-webstats.sql b/src/main/sql/webstats/init-webstats.sql index 1396fa5..dec8eb7 100644 --- a/src/main/sql/webstats/init-webstats.sql +++ b/src/main/sql/webstats/init-webstats.sql @@ -1,4 +1,4 @@ --- Copyright 2016--2018 The Tor Project +-- Copyright 2016--2020 The Tor Project -- See LICENSE for licensing information CREATE TYPE method AS ENUM ('GET', 'HEAD'); diff --git a/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java b/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java index 92752ef..e2f228a 100644 --- a/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java +++ b/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.advbwdist; diff --git a/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java b/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java index 69001da..900bd02 100644 --- a/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java +++ b/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.connbidirect; diff --git a/src/test/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatusTest.java b/src/test/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatusTest.java index 4ad0b9c..7fcb306 100644 --- a/src/test/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatusTest.java +++ b/src/test/java/org/torproject/metrics/stats/servers/Ipv6NetworkStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/test/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptorTest.java b/src/test/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptorTest.java index 54a6941..dee2ed6 100644 --- a/src/test/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptorTest.java +++ b/src/test/java/org/torproject/metrics/stats/servers/Ipv6ServerDescriptorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.servers; diff --git a/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusTest.java b/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusTest.java index 1c5b408..1a43a53 100644 --- a/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusTest.java +++ b/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.stats.totalcw; diff --git a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java index a3ef6fa..99e55a6 100644 --- a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java +++ b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/src/test/sql/servers/test-ipv6servers.sql b/src/test/sql/servers/test-ipv6servers.sql index 797cfd0..8b0eab5 100644 --- a/src/test/sql/servers/test-ipv6servers.sql +++ b/src/test/sql/servers/test-ipv6servers.sql @@ -1,4 +1,4 @@ --- Copyright 2017--2018 The Tor Project +-- Copyright 2017--2020 The Tor Project -- See LICENSE for licensing information -- Hint: You'll need pgTAP in order to run these tests! diff --git a/src/test/sql/userstats/test-userstats.sql b/src/test/sql/userstats/test-userstats.sql index 5be866d..2de4786 100644 --- a/src/test/sql/userstats/test-userstats.sql +++ b/src/test/sql/userstats/test-userstats.sql @@ -1,4 +1,4 @@ --- Copyright 2013--2018 The Tor Project +-- Copyright 2013--2020 The Tor Project -- See LICENSE for licensing information -- Hint: You'll need pgTAP in order to run these tests!

1 0

[exonerator/master] Update copyright to 2020.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 20501a55241d90a015ea7efcef3f18371c6c80c8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:45:54 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java | 2 +- .../org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java | 2 +- src/main/java/org/torproject/metrics/exonerator/QueryResponse.java | 2 +- src/main/java/org/torproject/metrics/exonerator/QueryServlet.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ServerMain.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/sql/exonerator.sql | 2 +- src/main/sql/exonerator2.sql | 2 +- src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java | 2 +- .../java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java | 2 +- src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 49d61f8..d7b0663 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010--2017 The Tor Project +Copyright 2010--2020 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 47261fc..c9cc6b9 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java index 92d6b31..8e084d6 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java index fbe4e49..ebcbaca 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 92cc8bb..3ba42da 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index 6a8976a..aee8dbf 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index 760e385..85dec57 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ServerMain.java b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java index 3554915..0663e0f 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ServerMain.java +++ b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index d301e25..ebdc1de 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/sql/exonerator.sql b/src/main/sql/exonerator.sql index 7e5ad7e..e6245ce 100755 --- a/src/main/sql/exonerator.sql +++ b/src/main/sql/exonerator.sql @@ -1,4 +1,4 @@ --- Copyright 2011--2018 The Tor Project +-- Copyright 2011--2020 The Tor Project -- See LICENSE for licensing information -------------------------------------------------------------------------------- diff --git a/src/main/sql/exonerator2.sql b/src/main/sql/exonerator2.sql index 397d2bf..5ec1765 100755 --- a/src/main/sql/exonerator2.sql +++ b/src/main/sql/exonerator2.sql @@ -1,4 +1,4 @@ --- Copyright 2011--2018 The Tor Project +-- Copyright 2011--2020 The Tor Project -- See LICENSE for licensing information -------------------------------------------------------------------------------- diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java index 0276e1f..3c0ca83 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 1ede590..1814644 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator; diff --git a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java index 97ae88d..eb01a1f 100644 --- a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.exonerator;

1 0

[metrics-lib/master] Update copyright to 2020.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 0db8a5787ce3ff2cd31be957592c1ce0e38e12ce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:29:57 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- src/main/java/org/torproject/descriptor/BandwidthFile.java | 2 +- src/main/java/org/torproject/descriptor/BandwidthHistory.java | 2 +- src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java | 2 +- src/main/java/org/torproject/descriptor/BridgePoolAssignment.java | 2 +- src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/BridgedbMetrics.java | 2 +- src/main/java/org/torproject/descriptor/Descriptor.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorCollector.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorParseException.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorParser.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorReader.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java | 2 +- src/main/java/org/torproject/descriptor/DirSourceEntry.java | 2 +- src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java | 2 +- src/main/java/org/torproject/descriptor/DirectorySignature.java | 2 +- src/main/java/org/torproject/descriptor/ExitList.java | 2 +- src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/LogDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/Method.java | 2 +- src/main/java/org/torproject/descriptor/Microdescriptor.java | 2 +- src/main/java/org/torproject/descriptor/NetworkStatusEntry.java | 2 +- src/main/java/org/torproject/descriptor/RelayDirectory.java | 2 +- src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/RelayNetworkStatus.java | 2 +- .../java/org/torproject/descriptor/RelayNetworkStatusConsensus.java | 2 +- src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java | 2 +- src/main/java/org/torproject/descriptor/RelayServerDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/RouterStatusEntry.java | 2 +- src/main/java/org/torproject/descriptor/ServerDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/SnowflakeStats.java | 2 +- src/main/java/org/torproject/descriptor/TorperfResult.java | 2 +- src/main/java/org/torproject/descriptor/UnparseableDescriptor.java | 2 +- src/main/java/org/torproject/descriptor/WebServerAccessLog.java | 2 +- src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java | 2 +- .../org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java | 2 +- .../java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java | 2 +- .../org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java | 2 +- .../java/org/torproject/descriptor/impl/DirectorySignatureImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ExitListImpl.java | 2 +- .../java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/KeyValueMap.java | 2 +- src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 2 +- src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java | 2 +- .../org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java | 2 +- .../org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java | 2 +- .../java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 2 +- .../java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 2 +- .../java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java | 2 +- .../java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/index/DescriptorIndexCollector.java | 2 +- src/main/java/org/torproject/descriptor/index/DirectoryNode.java | 2 +- src/main/java/org/torproject/descriptor/index/FileNode.java | 2 +- src/main/java/org/torproject/descriptor/index/IndexNode.java | 2 +- src/main/java/org/torproject/descriptor/index/package-info.java | 2 +- src/main/java/org/torproject/descriptor/internal/FileType.java | 2 +- src/main/java/org/torproject/descriptor/internal/package-info.java | 2 +- src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java | 2 +- .../java/org/torproject/descriptor/log/InternalWebServerAccessLog.java | 2 +- src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java | 2 +- src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java | 2 +- src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java | 2 +- src/main/java/org/torproject/descriptor/log/package-info.java | 2 +- src/main/java/org/torproject/descriptor/package-info.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/resources/examples/ConsensusWeightByVersion.java | 2 +- src/main/resources/examples/DownloadConsensuses.java | 2 +- src/main/resources/examples/PluggableTransports.java | 2 +- .../java/org/torproject/descriptor/DescriptorSourceFactoryTest.java | 2 +- src/test/java/org/torproject/descriptor/DescriptorTest.java | 2 +- .../java/org/torproject/descriptor/DummyCollectorImplementation.java | 2 +- src/test/java/org/torproject/descriptor/DummyParserImplementation.java | 2 +- src/test/java/org/torproject/descriptor/DummyReaderImplementation.java | 2 +- .../java/org/torproject/descriptor/benchmark/MeasurePerformance.java | 2 +- src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java | 2 +- .../java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java | 2 +- src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/DescriptorParserImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java | 2 +- .../org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java | 2 +- .../torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java | 2 +- .../org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java | 2 +- .../java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/TestDescriptor.java | 2 +- src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java | 2 +- src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java | 2 +- src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java | 2 +- .../org/torproject/descriptor/index/DescriptorIndexCollectorTest.java | 2 +- src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java | 2 +- src/test/java/org/torproject/descriptor/index/FileNodeTest.java | 2 +- src/test/java/org/torproject/descriptor/index/IndexNodeTest.java | 2 +- src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java | 2 +- .../java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java | 2 +- src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java | 2 +- src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java | 2 +- 119 files changed, 119 insertions(+), 119 deletions(-) diff --git a/LICENSE b/LICENSE index 97665c8..4c108b6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011--2017 The Tor Project +Copyright 2011--2020 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/main/java/org/torproject/descriptor/BandwidthFile.java b/src/main/java/org/torproject/descriptor/BandwidthFile.java index 34b9414..bbc4056 100644 --- a/src/main/java/org/torproject/descriptor/BandwidthFile.java +++ b/src/main/java/org/torproject/descriptor/BandwidthFile.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BandwidthHistory.java b/src/main/java/org/torproject/descriptor/BandwidthHistory.java index 0389fe9..7548185 100644 --- a/src/main/java/org/torproject/descriptor/BandwidthHistory.java +++ b/src/main/java/org/torproject/descriptor/BandwidthHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java index d2fa37d..07016cb 100644 --- a/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/BridgeExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java b/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java index 8afb827..9c78b77 100644 --- a/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java +++ b/src/main/java/org/torproject/descriptor/BridgeNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java b/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java index f42ea15..92f4eec 100644 --- a/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java +++ b/src/main/java/org/torproject/descriptor/BridgePoolAssignment.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java b/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java index 47ee9f4..13f3c03 100644 --- a/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/BridgeServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/BridgedbMetrics.java b/src/main/java/org/torproject/descriptor/BridgedbMetrics.java index 68d9d4f..6dbe06d 100644 --- a/src/main/java/org/torproject/descriptor/BridgedbMetrics.java +++ b/src/main/java/org/torproject/descriptor/BridgedbMetrics.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/Descriptor.java b/src/main/java/org/torproject/descriptor/Descriptor.java index d745dce..5d2820c 100644 --- a/src/main/java/org/torproject/descriptor/Descriptor.java +++ b/src/main/java/org/torproject/descriptor/Descriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorCollector.java b/src/main/java/org/torproject/descriptor/DescriptorCollector.java index 823a62d..0f351d1 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorCollector.java +++ b/src/main/java/org/torproject/descriptor/DescriptorCollector.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorParseException.java b/src/main/java/org/torproject/descriptor/DescriptorParseException.java index 7594b45..5c810aa 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParseException.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParseException.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorParser.java b/src/main/java/org/torproject/descriptor/DescriptorParser.java index 159af8d..401181a 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParser.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorReader.java b/src/main/java/org/torproject/descriptor/DescriptorReader.java index 7eab1e6..be94254 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorReader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorReader.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index 80ea524..97f93cc 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DirSourceEntry.java b/src/main/java/org/torproject/descriptor/DirSourceEntry.java index 41f5c05..daac9e4 100644 --- a/src/main/java/org/torproject/descriptor/DirSourceEntry.java +++ b/src/main/java/org/torproject/descriptor/DirSourceEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java b/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java index 3b44f9f..c0f616e 100644 --- a/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java +++ b/src/main/java/org/torproject/descriptor/DirectoryKeyCertificate.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DirectorySignature.java b/src/main/java/org/torproject/descriptor/DirectorySignature.java index 2522fd7..bc720a6 100644 --- a/src/main/java/org/torproject/descriptor/DirectorySignature.java +++ b/src/main/java/org/torproject/descriptor/DirectorySignature.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ExitList.java b/src/main/java/org/torproject/descriptor/ExitList.java index a631f3c..563ae4f 100644 --- a/src/main/java/org/torproject/descriptor/ExitList.java +++ b/src/main/java/org/torproject/descriptor/ExitList.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java index 812d6aa..a2c893b 100644 --- a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/LogDescriptor.java b/src/main/java/org/torproject/descriptor/LogDescriptor.java index 5828441..17751a7 100644 --- a/src/main/java/org/torproject/descriptor/LogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/LogDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/Method.java b/src/main/java/org/torproject/descriptor/Method.java index 771fb10..42c6819 100644 --- a/src/main/java/org/torproject/descriptor/Method.java +++ b/src/main/java/org/torproject/descriptor/Method.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/Microdescriptor.java b/src/main/java/org/torproject/descriptor/Microdescriptor.java index 8a33a3b..feaf00b 100644 --- a/src/main/java/org/torproject/descriptor/Microdescriptor.java +++ b/src/main/java/org/torproject/descriptor/Microdescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java b/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java index e602a04..5a2cae1 100644 --- a/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java +++ b/src/main/java/org/torproject/descriptor/NetworkStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayDirectory.java b/src/main/java/org/torproject/descriptor/RelayDirectory.java index e2a5dca..61fd25d 100644 --- a/src/main/java/org/torproject/descriptor/RelayDirectory.java +++ b/src/main/java/org/torproject/descriptor/RelayDirectory.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java index 133d9e3..c779065 100644 --- a/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/RelayExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java index 90f050b..9ea54a5 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java index e8ec89f..124bf7f 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java index 9514765..5ed31b3 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java b/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java index 2e8118a..ea73ef8 100644 --- a/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/RelayServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/RouterStatusEntry.java b/src/main/java/org/torproject/descriptor/RouterStatusEntry.java index 8b96c52..538157d 100644 --- a/src/main/java/org/torproject/descriptor/RouterStatusEntry.java +++ b/src/main/java/org/torproject/descriptor/RouterStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ServerDescriptor.java b/src/main/java/org/torproject/descriptor/ServerDescriptor.java index 9ecd46b..2e0ecbd 100644 --- a/src/main/java/org/torproject/descriptor/ServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/SnowflakeStats.java b/src/main/java/org/torproject/descriptor/SnowflakeStats.java index 5c464df..2fe78df 100644 --- a/src/main/java/org/torproject/descriptor/SnowflakeStats.java +++ b/src/main/java/org/torproject/descriptor/SnowflakeStats.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/TorperfResult.java b/src/main/java/org/torproject/descriptor/TorperfResult.java index add36ff..da48e0b 100644 --- a/src/main/java/org/torproject/descriptor/TorperfResult.java +++ b/src/main/java/org/torproject/descriptor/TorperfResult.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java b/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java index 691df29..7a93524 100644 --- a/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java +++ b/src/main/java/org/torproject/descriptor/UnparseableDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/WebServerAccessLog.java b/src/main/java/org/torproject/descriptor/WebServerAccessLog.java index ac50b15..f157321 100644 --- a/src/main/java/org/torproject/descriptor/WebServerAccessLog.java +++ b/src/main/java/org/torproject/descriptor/WebServerAccessLog.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java index 657b90e..f9198a4 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index ec6de2d..00a7732 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java index dbd518e..c16a24d 100644 --- a/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java index 0ca4cfd..2865cf4 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index c3e7cb4..d3d546b 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index 80e126d..2fdad0b 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java index f2de3f2..4fcd548 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java index f683067..431ab12 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgedbMetricsImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index b6dbf74..4b380bc 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 25494f4..0a2444b 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 207baca..08c82ec 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java index a00ffa1..1e98b5a 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 8ae1ed7..1029c9b 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java index 248d546..8f2bbb9 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java index ba203e2..f7f91df 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java index b1ffa67..fd312d2 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 17ac6e5..5880b0e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java index 6cb4680..23c4aa5 100644 --- a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java +++ b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java index 47028bd..fe965e5 100644 --- a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index e6a78f6..5c65482 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index b763f30..b994016 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index cd73278..dcf2a0e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 55303d2..94d256c 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java index e24645f..fd56252 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 66b8eaa..79f0756 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 9860df0..0fba932 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 8e83b83..56a9e21 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java index 0d1b7a0..c920ac0 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java index 6678ce7..f5d31a1 100644 --- a/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RouterStatusEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index f33e2e8..aac4bcc 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java index daaa933..6552325 100644 --- a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 83e9491..b883012 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java index eca29c9..fe10237 100644 --- a/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/UnparseableDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index c472da0..b4aae59 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java index 9ed5784..c58b377 100644 --- a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java +++ b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/FileNode.java b/src/main/java/org/torproject/descriptor/index/FileNode.java index f505f16..6c35146 100644 --- a/src/main/java/org/torproject/descriptor/index/FileNode.java +++ b/src/main/java/org/torproject/descriptor/index/FileNode.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 9136b65..ce3faa4 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/package-info.java b/src/main/java/org/torproject/descriptor/index/package-info.java index 021cbea..4734ff6 100644 --- a/src/main/java/org/torproject/descriptor/index/package-info.java +++ b/src/main/java/org/torproject/descriptor/index/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/java/org/torproject/descriptor/internal/FileType.java b/src/main/java/org/torproject/descriptor/internal/FileType.java index 8f42624..439055a 100644 --- a/src/main/java/org/torproject/descriptor/internal/FileType.java +++ b/src/main/java/org/torproject/descriptor/internal/FileType.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.internal; diff --git a/src/main/java/org/torproject/descriptor/internal/package-info.java b/src/main/java/org/torproject/descriptor/internal/package-info.java index b845921..024f75f 100644 --- a/src/main/java/org/torproject/descriptor/internal/package-info.java +++ b/src/main/java/org/torproject/descriptor/internal/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java index 558f02a..82a5554 100644 --- a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java b/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java index 0c96e06..267554f 100644 --- a/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java +++ b/src/main/java/org/torproject/descriptor/log/InternalWebServerAccessLog.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java index b730465..a253c50 100644 --- a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java index 27ec355..188f5b0 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java index a4acc5f..3e19a75 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/main/java/org/torproject/descriptor/log/package-info.java b/src/main/java/org/torproject/descriptor/log/package-info.java index 68bcfa1..141d7fa 100644 --- a/src/main/java/org/torproject/descriptor/log/package-info.java +++ b/src/main/java/org/torproject/descriptor/log/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/java/org/torproject/descriptor/package-info.java b/src/main/java/org/torproject/descriptor/package-info.java index d844d40..e6f4391 100644 --- a/src/main/java/org/torproject/descriptor/package-info.java +++ b/src/main/java/org/torproject/descriptor/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ /** diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index d301e25..ebdc1de 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/resources/examples/ConsensusWeightByVersion.java b/src/main/resources/examples/ConsensusWeightByVersion.java index 5026999..d3b81e7 100644 --- a/src/main/resources/examples/ConsensusWeightByVersion.java +++ b/src/main/resources/examples/ConsensusWeightByVersion.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ import org.torproject.descriptor.*; diff --git a/src/main/resources/examples/DownloadConsensuses.java b/src/main/resources/examples/DownloadConsensuses.java index 359c76c..10ea5a7 100644 --- a/src/main/resources/examples/DownloadConsensuses.java +++ b/src/main/resources/examples/DownloadConsensuses.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ import org.torproject.descriptor.*; diff --git a/src/main/resources/examples/PluggableTransports.java b/src/main/resources/examples/PluggableTransports.java index 102adf0..cf96231 100644 --- a/src/main/resources/examples/PluggableTransports.java +++ b/src/main/resources/examples/PluggableTransports.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ import org.torproject.descriptor.*; diff --git a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java index de906db..6335145 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DescriptorTest.java b/src/test/java/org/torproject/descriptor/DescriptorTest.java index 719d16b..950422d 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java b/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java index 219bd2a..013ed82 100644 --- a/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java +++ b/src/test/java/org/torproject/descriptor/DummyCollectorImplementation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DummyParserImplementation.java b/src/test/java/org/torproject/descriptor/DummyParserImplementation.java index 54fc254..c28b7b4 100644 --- a/src/test/java/org/torproject/descriptor/DummyParserImplementation.java +++ b/src/test/java/org/torproject/descriptor/DummyParserImplementation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java b/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java index f9d9f3d..eb6aa33 100644 --- a/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java +++ b/src/test/java/org/torproject/descriptor/DummyReaderImplementation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java b/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java index 80d9792..ce5d393 100644 --- a/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java +++ b/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.benchmark; diff --git a/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java b/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java index d19b7e7..9286fdb 100644 --- a/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java index fd26eec..e586650 100644 --- a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java b/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java index 8c0e2d5..95405d9 100644 --- a/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/BridgedbMetricsImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java b/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java index 1c0fa81..f10be11 100644 --- a/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java +++ b/src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java index a0a32cf..a2a3e6a 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java index 00b99a4..033daea 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java index 01d190b..ceee1f1 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java index 44a868b..503a8bc 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 4aa2008..9750046 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java index 890071a..128d39a 100644 --- a/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/MicrodescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index b4c7d8a..5cbea00 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java index 80d46da..cb28d33 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index 9418a9c..6735b61 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 8e4424c..97456d6 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java index 0378fbc..4051b74 100644 --- a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java index 9748f00..34ba78a 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java index a596c9d..0cafce0 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2019 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java b/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java index 9649bb0..a5d3c72 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java +++ b/src/test/java/org/torproject/descriptor/impl/TestServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index b56490a..0e76c97 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index 2ac3359..967bc64 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java index eff1edf..37e5d55 100644 --- a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/index/FileNodeTest.java b/src/test/java/org/torproject/descriptor/index/FileNodeTest.java index 0fed293..7cae4cf 100644 --- a/src/test/java/org/torproject/descriptor/index/FileNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/FileNodeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java index 6695018..fd84340 100644 --- a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java index 609f6e5..875f6d8 100644 --- a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java index ec23b61..6cc5e43 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogLineTest.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java index b64c4df..74a40a8 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log; diff --git a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java index 8108720..32a48ee 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.log;

1 0

[collector/master] Update copyright to 2020.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit d2a74b676a0d1c8563638ca3607a866b95877949 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:36:34 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- src/main/java/org/torproject/metrics/collector/Main.java | 2 +- .../torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java | 2 +- .../metrics/collector/bridgedescs/BridgeDescriptorParser.java | 2 +- .../torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java | 2 +- .../org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java | 2 +- .../metrics/collector/bridgedescs/SanitizedBridgesWriter.java | 2 +- .../metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java | 2 +- src/main/java/org/torproject/metrics/collector/conf/Annotation.java | 2 +- src/main/java/org/torproject/metrics/collector/conf/Configuration.java | 2 +- .../org/torproject/metrics/collector/conf/ConfigurationException.java | 2 +- src/main/java/org/torproject/metrics/collector/conf/Key.java | 2 +- src/main/java/org/torproject/metrics/collector/conf/SourceType.java | 2 +- src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java | 2 +- src/main/java/org/torproject/metrics/collector/cron/Scheduler.java | 2 +- src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java | 2 +- .../java/org/torproject/metrics/collector/downloader/Downloader.java | 2 +- .../org/torproject/metrics/collector/exitlists/ExitListDownloader.java | 2 +- .../java/org/torproject/metrics/collector/indexer/CreateIndexJson.java | 2 +- .../java/org/torproject/metrics/collector/indexer/DirectoryNode.java | 2 +- src/main/java/org/torproject/metrics/collector/indexer/FileNode.java | 2 +- src/main/java/org/torproject/metrics/collector/indexer/IndexNode.java | 2 +- src/main/java/org/torproject/metrics/collector/indexer/IndexerTask.java | 2 +- .../org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java | 2 +- .../torproject/metrics/collector/persist/BandwidthFilePersistence.java | 2 +- .../metrics/collector/persist/BridgeExtraInfoPersistence.java | 2 +- .../metrics/collector/persist/BridgePoolAssignmentPersistence.java | 2 +- .../metrics/collector/persist/BridgeServerDescriptorPersistence.java | 2 +- .../metrics/collector/persist/BridgedbMetricsPersistence.java | 2 +- .../org/torproject/metrics/collector/persist/ConsensusPersistence.java | 2 +- .../org/torproject/metrics/collector/persist/DescriptorPersistence.java | 2 +- .../org/torproject/metrics/collector/persist/ExitlistPersistence.java | 2 +- .../org/torproject/metrics/collector/persist/ExtraInfoPersistence.java | 2 +- .../torproject/metrics/collector/persist/MicroConsensusPersistence.java | 2 +- .../org/torproject/metrics/collector/persist/OnionPerfPersistence.java | 2 +- .../java/org/torproject/metrics/collector/persist/PersistenceUtils.java | 2 +- .../metrics/collector/persist/ServerDescriptorPersistence.java | 2 +- .../torproject/metrics/collector/persist/SnowflakeStatsPersistence.java | 2 +- .../org/torproject/metrics/collector/persist/StatusPersistence.java | 2 +- .../java/org/torproject/metrics/collector/persist/VotePersistence.java | 2 +- .../metrics/collector/persist/WebServerAccessLogPersistence.java | 2 +- .../java/org/torproject/metrics/collector/persist/package-info.java | 2 +- .../java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java | 2 +- .../java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java | 2 +- .../metrics/collector/relaydescs/CachedRelayDescriptorReader.java | 2 +- .../org/torproject/metrics/collector/relaydescs/ReferenceChecker.java | 2 +- .../metrics/collector/relaydescs/RelayDescriptorDownloader.java | 2 +- .../torproject/metrics/collector/relaydescs/RelayDescriptorParser.java | 2 +- .../metrics/collector/snowflake/SnowflakeStatsDownloader.java | 2 +- src/main/java/org/torproject/metrics/collector/sync/Criterium.java | 2 +- .../java/org/torproject/metrics/collector/sync/ProcessCriterium.java | 2 +- src/main/java/org/torproject/metrics/collector/sync/SyncManager.java | 2 +- .../java/org/torproject/metrics/collector/sync/SyncPersistence.java | 2 +- src/main/java/org/torproject/metrics/collector/sync/package-info.java | 2 +- src/main/java/org/torproject/metrics/collector/webstats/FileType.java | 2 +- src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java | 2 +- .../java/org/torproject/metrics/collector/webstats/LogMetadata.java | 2 +- .../java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java | 2 +- .../torproject/metrics/collector/webstats/WebServerAccessLogImpl.java | 2 +- .../torproject/metrics/collector/webstats/WebServerAccessLogLine.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/resources/collector.properties | 2 +- src/main/resources/create-tarballs.sh | 2 +- src/test/java/org/torproject/metrics/collector/MainTest.java | 2 +- .../metrics/collector/bridgedescs/BridgeDescriptorParserTest.java | 2 +- .../metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java | 2 +- .../collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java | 2 +- .../metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java | 2 +- .../metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java | 2 +- .../torproject/metrics/collector/bridgedescs/TarballTestBuilder.java | 2 +- .../torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java | 2 +- .../java/org/torproject/metrics/collector/conf/ConfigurationTest.java | 2 +- src/test/java/org/torproject/metrics/collector/cron/Broken.java | 2 +- .../java/org/torproject/metrics/collector/cron/CollecTorMainTest.java | 2 +- src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java | 2 +- .../org/torproject/metrics/collector/downloader/DownloaderTest.java | 2 +- .../org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java | 2 +- .../java/org/torproject/metrics/collector/indexer/IndexerTaskTest.java | 2 +- .../java/org/torproject/metrics/collector/persist/PersistUtilsTest.java | 2 +- .../torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java | 2 +- src/test/java/org/torproject/metrics/collector/sync/FileCollector.java | 2 +- .../java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java | 2 +- .../java/org/torproject/metrics/collector/webstats/LogFileMapTest.java | 2 +- .../java/org/torproject/metrics/collector/webstats/LogMetadataTest.java | 2 +- .../org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/LICENSE b/LICENSE index eb96349..9aaf268 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010--2017 The Tor Project +Copyright 2010--2020 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/main/java/org/torproject/metrics/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java index 861567f..77bb2ca 100644 --- a/src/main/java/org/torproject/metrics/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java b/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java index 9bb4f36..c6b939b 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedb; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java index 778d187..b5e30bc 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 041807e..de9cd4b 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java index 8fc25b4..b4b63e7 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; 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 45f2a1a..6aee057 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java index 875273d..6034e1d 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java +++ b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2019 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgepools; diff --git a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java index ff5119e..0d3530e 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.conf; diff --git a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java index cfdd9c8..52e1d05 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.conf; diff --git a/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java b/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java index 5257434..fb45ee8 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java +++ b/src/main/java/org/torproject/metrics/collector/conf/ConfigurationException.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.conf; diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java index d0b8a5a..866cbad 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.conf; diff --git a/src/main/java/org/torproject/metrics/collector/conf/SourceType.java b/src/main/java/org/torproject/metrics/collector/conf/SourceType.java index ed5df4d..6d2ea84 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/SourceType.java +++ b/src/main/java/org/torproject/metrics/collector/conf/SourceType.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.conf; diff --git a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java index 09796e3..49174ca 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.cron; diff --git a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java index 054f03f..03292f4 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.cron; diff --git a/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java index 70699f6..c8f0807 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java +++ b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.cron; diff --git a/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java b/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java index a1f3852..e82737e 100644 --- a/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java +++ b/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.downloader; diff --git a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index b4bee15..49e176b 100644 --- a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.exitlists; diff --git a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java index 15aa31d..6613e9f 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2019 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/main/java/org/torproject/metrics/collector/indexer/DirectoryNode.java b/src/main/java/org/torproject/metrics/collector/indexer/DirectoryNode.java index a369d08..c537709 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/DirectoryNode.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/DirectoryNode.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/main/java/org/torproject/metrics/collector/indexer/FileNode.java b/src/main/java/org/torproject/metrics/collector/indexer/FileNode.java index c007196..c3031a4 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/FileNode.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/FileNode.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/main/java/org/torproject/metrics/collector/indexer/IndexNode.java b/src/main/java/org/torproject/metrics/collector/indexer/IndexNode.java index 8b7a46b..7d7569c 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/IndexNode.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/IndexNode.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/main/java/org/torproject/metrics/collector/indexer/IndexerTask.java b/src/main/java/org/torproject/metrics/collector/indexer/IndexerTask.java index 03c750b..dee2c30 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/IndexerTask.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/IndexerTask.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java index b106be7..dc1a675 100644 --- a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.onionperf; diff --git a/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java index aeaf0ee..bbbfca5 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java index 23245c3..04cb473 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgeExtraInfoPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/BridgePoolAssignmentPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgePoolAssignmentPersistence.java index 5613060..e729dab 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/BridgePoolAssignmentPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgePoolAssignmentPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java index 7694f14..27c37d0 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgeServerDescriptorPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/BridgedbMetricsPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BridgedbMetricsPersistence.java index a72ffe2..a6ca106 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/BridgedbMetricsPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/BridgedbMetricsPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java index b48077f..2ae9357 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ConsensusPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java index 20cd570..7c648ef 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/DescriptorPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java index 307f3fa..3f85600 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ExitlistPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java index 4ac8cba..33b4c3c 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ExtraInfoPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java index a3e189a..5514c28 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/MicroConsensusPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java index bc654a4..7ed16a2 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java index 78eac72..72ad73a 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java index bb0ae64..71a2493 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/ServerDescriptorPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java index ee6e029..d9ae41c 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java index c3cbf9e..c379410 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/StatusPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java b/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java index 0c1f80a..461ca40 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/VotePersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java index 0001957..1c4d519 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/WebServerAccessLogPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/main/java/org/torproject/metrics/collector/persist/package-info.java b/src/main/java/org/torproject/metrics/collector/persist/package-info.java index 75ec95e..2b32235 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/persist/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ /** This package contains decorating classes for descriptors that diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index 3326833..5a80058 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index 911ac2a..e0e1623 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 0a8012a..21a3041 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java index f3a21ba..5ff77e7 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index 3337633..b0fcebb 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java index abbd777..3905458 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2018 The Tor Project +/* Copyright 2010--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java index cb5f0cc..f40c311 100644 --- a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.snowflake; diff --git a/src/main/java/org/torproject/metrics/collector/sync/Criterium.java b/src/main/java/org/torproject/metrics/collector/sync/Criterium.java index a90de8e..67cebdc 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/Criterium.java +++ b/src/main/java/org/torproject/metrics/collector/sync/Criterium.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.sync; diff --git a/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java b/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java index d4ec149..ed442fa 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java +++ b/src/main/java/org/torproject/metrics/collector/sync/ProcessCriterium.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.sync; diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java index 5a1a142..e42ae61 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.sync; diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index f6678fe..f81e164 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.sync; diff --git a/src/main/java/org/torproject/metrics/collector/sync/package-info.java b/src/main/java/org/torproject/metrics/collector/sync/package-info.java index 53e64b7..0761fd5 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/sync/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ /** This package coordinates syncing and merging the fetched data. diff --git a/src/main/java/org/torproject/metrics/collector/webstats/FileType.java b/src/main/java/org/torproject/metrics/collector/webstats/FileType.java index 15b1e00..489bba4 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/FileType.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/FileType.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2019 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java index d3e7dcd..5be6b50 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java b/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java index b30c13a..d3bf8fb 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogMetadata.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index b3fee06..6c8a495 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogImpl.java b/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogImpl.java index f091aa1..0e51c05 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogImpl.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogLine.java b/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogLine.java index bc03c0a..816064a 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogLine.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/WebServerAccessLogLine.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index d301e25..ebdc1de 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 6422120..61baed5 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -223,4 +223,4 @@ BridgedbMetricsLocalOrigins = in/bridgedb-stats ## Retrieve files from the following instances. ## List of URLs separated by comma. BridgedbMetricsSyncOrigins = https://collector.torproject.org -# \ No newline at end of file +# diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index 3927960..07952c7 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information. # # Script for creating descriptor tarballs on a CollecTor instance, diff --git a/src/test/java/org/torproject/metrics/collector/MainTest.java b/src/test/java/org/torproject/metrics/collector/MainTest.java index f3f2500..02c16df 100644 --- a/src/test/java/org/torproject/metrics/collector/MainTest.java +++ b/src/test/java/org/torproject/metrics/collector/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java index 4ea2e97..de82ab7 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java index 45d6925..f7e6acc 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/ExtraInfoTestDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java index d04fc3c..60540e4 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/NetworkStatusTestDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java index 1267d4a..67e9738 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java index c0a6bf5..ec0807d 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/ServerTestDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java index 08dca84..0009463 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/TarballTestBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java b/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java index 81df984..03c7267 100644 --- a/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java +++ b/src/test/java/org/torproject/metrics/collector/bridgedescs/TestDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.bridgedescs; diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index 6f5d16c..c45cd4f 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.conf; diff --git a/src/test/java/org/torproject/metrics/collector/cron/Broken.java b/src/test/java/org/torproject/metrics/collector/cron/Broken.java index 44aa88b..a4a624a 100644 --- a/src/test/java/org/torproject/metrics/collector/cron/Broken.java +++ b/src/test/java/org/torproject/metrics/collector/cron/Broken.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.cron; diff --git a/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java index cc124a4..2818127 100644 --- a/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.cron; diff --git a/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java index 3f20646..c41f52d 100644 --- a/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.cron; diff --git a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java index aef8c0c..fb21498 100644 --- a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java +++ b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.downloader; diff --git a/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java b/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java index db00032..9c01293 100644 --- a/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java +++ b/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/test/java/org/torproject/metrics/collector/indexer/IndexerTaskTest.java b/src/test/java/org/torproject/metrics/collector/indexer/IndexerTaskTest.java index 8e5e6f4..6c67214 100644 --- a/src/test/java/org/torproject/metrics/collector/indexer/IndexerTaskTest.java +++ b/src/test/java/org/torproject/metrics/collector/indexer/IndexerTaskTest.java @@ -1,4 +1,4 @@ -/* Copyright 2019 The Tor Project +/* Copyright 2019--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.indexer; diff --git a/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java b/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java index 6774923..a33b94f 100644 --- a/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java +++ b/src/test/java/org/torproject/metrics/collector/persist/PersistUtilsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.persist; diff --git a/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java index 9489315..a68cd32 100644 --- a/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java +++ b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.relaydescs; diff --git a/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java b/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java index e84a62f..01710bf 100644 --- a/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java +++ b/src/test/java/org/torproject/metrics/collector/sync/FileCollector.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.sync; diff --git a/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java index a8f7095..acd326b 100644 --- a/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java +++ b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.sync; diff --git a/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java b/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java index 89cfc10..d765cbd 100644 --- a/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/LogFileMapTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java b/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java index 24629ab..20d7656 100644 --- a/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/LogMetadataTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats; diff --git a/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java b/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java index 21617b5..803975e 100644 --- a/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java +++ b/src/test/java/org/torproject/metrics/collector/webstats/SanitizeWeblogsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collector.webstats;

1 0