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

[tor/master] Merge branch 'bug21019_030_01_squashed'
by nickm＠torproject.org 13 Jan '17

13 Jan '17

commit 5762d6489d90e0259d8dac2557e7faa045b458fc Merge: 2e656d1 fb8dad5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 13 12:11:00 2017 -0500 Merge branch 'bug21019_030_01_squashed' src/or/connection_edge.c | 32 +++++++++++++++++++++++++++++++- src/or/connection_edge.h | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-)

1 0

[collector/master] Update copyright.
by karsten＠torproject.org 13 Jan '17

13 Jan '17

commit 2a8f32c6e7668ef4f02dbb128f1ce4eb56e61429 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 16:56:53 2017 +0100 Update copyright. --- LICENSE | 2 +- src/main/java/org/torproject/collector/Main.java | 2 +- .../org/torproject/collector/bridgedescs/BridgeDescriptorParser.java | 2 +- .../java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java | 2 +- .../org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java | 2 +- src/main/java/org/torproject/collector/conf/Annotation.java | 2 +- src/main/java/org/torproject/collector/conf/Configuration.java | 2 +- src/main/java/org/torproject/collector/conf/ConfigurationException.java | 2 +- src/main/java/org/torproject/collector/conf/Key.java | 2 +- src/main/java/org/torproject/collector/conf/SourceType.java | 2 +- src/main/java/org/torproject/collector/cron/CollecTorMain.java | 2 +- src/main/java/org/torproject/collector/cron/Scheduler.java | 2 +- src/main/java/org/torproject/collector/cron/ShutdownHook.java | 2 +- .../java/org/torproject/collector/exitlists/ExitListDownloader.java | 2 +- src/main/java/org/torproject/collector/index/CreateIndexJson.java | 2 +- .../org/torproject/collector/persist/BridgeExtraInfoPersistence.java | 2 +- .../torproject/collector/persist/BridgeServerDescriptorPersistence.java | 2 +- .../java/org/torproject/collector/persist/ConsensusPersistence.java | 2 +- .../java/org/torproject/collector/persist/DescriptorPersistence.java | 2 +- src/main/java/org/torproject/collector/persist/ExitlistPersistence.java | 2 +- .../java/org/torproject/collector/persist/ExtraInfoPersistence.java | 2 +- .../org/torproject/collector/persist/MicroConsensusPersistence.java | 2 +- src/main/java/org/torproject/collector/persist/PersistenceUtils.java | 2 +- .../org/torproject/collector/persist/ServerDescriptorPersistence.java | 2 +- src/main/java/org/torproject/collector/persist/StatusPersistence.java | 2 +- src/main/java/org/torproject/collector/persist/VotePersistence.java | 2 +- src/main/java/org/torproject/collector/persist/package-info.java | 2 +- src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java | 2 +- src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java | 2 +- .../torproject/collector/relaydescs/CachedRelayDescriptorReader.java | 2 +- src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java | 2 +- .../org/torproject/collector/relaydescs/RelayDescriptorDownloader.java | 2 +- .../java/org/torproject/collector/relaydescs/RelayDescriptorParser.java | 2 +- src/main/java/org/torproject/collector/sync/Criterium.java | 2 +- src/main/java/org/torproject/collector/sync/ProcessCriterium.java | 2 +- src/main/java/org/torproject/collector/sync/SyncManager.java | 2 +- src/main/java/org/torproject/collector/sync/SyncPersistence.java | 2 +- src/main/java/org/torproject/collector/sync/package-info.java | 2 +- src/main/java/org/torproject/collector/torperf/TorperfDownloader.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/resources/create-tarballs.sh | 2 +- src/test/java/org/torproject/collector/MainTest.java | 2 +- .../torproject/collector/bridgedescs/BridgeDescriptorParserTest.java | 2 +- .../java/org/torproject/collector/bridgedescs/DescriptorBuilder.java | 2 +- .../torproject/collector/bridgedescs/ExtraInfoDescriptorBuilder.java | 2 +- .../java/org/torproject/collector/bridgedescs/NetworkStatusBuilder.java | 2 +- .../torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java | 2 +- .../org/torproject/collector/bridgedescs/ServerDescriptorBuilder.java | 2 +- src/test/java/org/torproject/collector/bridgedescs/TarballBuilder.java | 2 +- src/test/java/org/torproject/collector/conf/ConfigurationTest.java | 2 +- src/test/java/org/torproject/collector/cron/Broken.java | 2 +- src/test/java/org/torproject/collector/cron/CollecTorMainTest.java | 2 +- src/test/java/org/torproject/collector/cron/SchedulerTest.java | 2 +- src/test/java/org/torproject/collector/persist/PersistUtilsTest.java | 2 +- .../java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java | 2 +- src/test/java/org/torproject/collector/sync/FileCollector.java | 2 +- src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/LICENSE b/LICENSE index f21c51d..eb96349 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010--2012 The Tor Project +Copyright 2010--2017 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/collector/Main.java b/src/main/java/org/torproject/collector/Main.java index 0feeec9..9ce709a 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/collector/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector; diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java index 7c83884..fae2ba3 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java index 9d8b06a..0552307 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index c54d83e..0898670 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/main/java/org/torproject/collector/conf/Annotation.java b/src/main/java/org/torproject/collector/conf/Annotation.java index 7f301bb..5bdfbe6 100644 --- a/src/main/java/org/torproject/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/collector/conf/Annotation.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.conf; diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index d194a94..7c7acc6 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.conf; diff --git a/src/main/java/org/torproject/collector/conf/ConfigurationException.java b/src/main/java/org/torproject/collector/conf/ConfigurationException.java index 730b1b3..723c3d8 100644 --- a/src/main/java/org/torproject/collector/conf/ConfigurationException.java +++ b/src/main/java/org/torproject/collector/conf/ConfigurationException.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.conf; diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index 4a0e9bc..0274c98 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.conf; diff --git a/src/main/java/org/torproject/collector/conf/SourceType.java b/src/main/java/org/torproject/collector/conf/SourceType.java index b6eb7ce..9b42e9f 100644 --- a/src/main/java/org/torproject/collector/conf/SourceType.java +++ b/src/main/java/org/torproject/collector/conf/SourceType.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.conf; diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/collector/cron/CollecTorMain.java index 8581310..42530b7 100644 --- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/collector/cron/CollecTorMain.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.cron; diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java index aa86cad..4e1a726 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/collector/cron/Scheduler.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.cron; diff --git a/src/main/java/org/torproject/collector/cron/ShutdownHook.java b/src/main/java/org/torproject/collector/cron/ShutdownHook.java index 519f16d..1e359b1 100644 --- a/src/main/java/org/torproject/collector/cron/ShutdownHook.java +++ b/src/main/java/org/torproject/collector/cron/ShutdownHook.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.cron; diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index 3c2f403..27afad6 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.exitlists; diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 4db4a7b..ba3ea7b 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2016 The Tor Project +/* Copyright 2015--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.index; diff --git a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java b/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java index f580b65..72db7c5 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java +++ b/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java b/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java index 3dd93b7..f1abb98 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java b/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java index a6ca2a9..cf8b027 100644 --- a/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java +++ b/src/main/java/org/torproject/collector/persist/ConsensusPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java b/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java index d0414e7..d54392d 100644 --- a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java +++ b/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java b/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java index 9ee1123..73895e4 100644 --- a/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java +++ b/src/main/java/org/torproject/collector/persist/ExitlistPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java b/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java index 1100050..9a944a7 100644 --- a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java +++ b/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java b/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java index 6ddc87f..a3e29a2 100644 --- a/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java +++ b/src/main/java/org/torproject/collector/persist/MicroConsensusPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/PersistenceUtils.java b/src/main/java/org/torproject/collector/persist/PersistenceUtils.java index d3678f2..7d20882 100644 --- a/src/main/java/org/torproject/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/collector/persist/PersistenceUtils.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java b/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java index 266cad3..642da7b 100644 --- a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/StatusPersistence.java b/src/main/java/org/torproject/collector/persist/StatusPersistence.java index cbad3b1..cca7201 100644 --- a/src/main/java/org/torproject/collector/persist/StatusPersistence.java +++ b/src/main/java/org/torproject/collector/persist/StatusPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/VotePersistence.java b/src/main/java/org/torproject/collector/persist/VotePersistence.java index 33edfc9..c89ee51 100644 --- a/src/main/java/org/torproject/collector/persist/VotePersistence.java +++ b/src/main/java/org/torproject/collector/persist/VotePersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/persist/package-info.java b/src/main/java/org/torproject/collector/persist/package-info.java index 599b7c5..8473821 100644 --- a/src/main/java/org/torproject/collector/persist/package-info.java +++ b/src/main/java/org/torproject/collector/persist/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java index 3f15eec..a4c19cf 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java index f4ed1e8..f2e3e6c 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java index acfe0b1..53b1e54 100644 --- a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java index dead416..5e7e86f 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java index 0d5dc6d..df1b367 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java index fda87bf..d71e1f8 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2010--2016 The Tor Project +/* Copyright 2010--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/main/java/org/torproject/collector/sync/Criterium.java b/src/main/java/org/torproject/collector/sync/Criterium.java index 7f51a17..dbb7d8e 100644 --- a/src/main/java/org/torproject/collector/sync/Criterium.java +++ b/src/main/java/org/torproject/collector/sync/Criterium.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync; diff --git a/src/main/java/org/torproject/collector/sync/ProcessCriterium.java b/src/main/java/org/torproject/collector/sync/ProcessCriterium.java index aa15ee6..1fa05aa 100644 --- a/src/main/java/org/torproject/collector/sync/ProcessCriterium.java +++ b/src/main/java/org/torproject/collector/sync/ProcessCriterium.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync; diff --git a/src/main/java/org/torproject/collector/sync/SyncManager.java b/src/main/java/org/torproject/collector/sync/SyncManager.java index e199836..b9df0bd 100644 --- a/src/main/java/org/torproject/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/collector/sync/SyncManager.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync; diff --git a/src/main/java/org/torproject/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/collector/sync/SyncPersistence.java index 5c67a75..5f18f63 100644 --- a/src/main/java/org/torproject/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/collector/sync/SyncPersistence.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync; diff --git a/src/main/java/org/torproject/collector/sync/package-info.java b/src/main/java/org/torproject/collector/sync/package-info.java index 8557bc3..ede4727 100644 --- a/src/main/java/org/torproject/collector/sync/package-info.java +++ b/src/main/java/org/torproject/collector/sync/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync; diff --git a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java index db18267..66f6e84 100644 --- a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2012-2016 The Tor Project +/* Copyright 2012-2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.torperf; diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index 33a1a50..28fb975 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 The Tor Project +# Copyright 2016--2017 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index 4b6aa57..976b15e 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016 The Tor Project +# Copyright 2016--2017 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/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java index 2a1dc50..53a875d 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/collector/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector; diff --git a/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java b/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java index 3527956..5e55c76 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java +++ b/src/test/java/org/torproject/collector/bridgedescs/BridgeDescriptorParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/test/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java index fa7433c..08f9820 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/test/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoDescriptorBuilder.java b/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoDescriptorBuilder.java index 1827acd..9fe35ec 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoDescriptorBuilder.java +++ b/src/test/java/org/torproject/collector/bridgedescs/ExtraInfoDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusBuilder.java b/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusBuilder.java index dc99a93..1008ff8 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusBuilder.java +++ b/src/test/java/org/torproject/collector/bridgedescs/NetworkStatusBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java index 847d89b..44bf69b 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java +++ b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/bridgedescs/ServerDescriptorBuilder.java b/src/test/java/org/torproject/collector/bridgedescs/ServerDescriptorBuilder.java index 182f26f..4b5a73e 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/ServerDescriptorBuilder.java +++ b/src/test/java/org/torproject/collector/bridgedescs/ServerDescriptorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/bridgedescs/TarballBuilder.java b/src/test/java/org/torproject/collector/bridgedescs/TarballBuilder.java index eddfb2b..aad4690 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/TarballBuilder.java +++ b/src/test/java/org/torproject/collector/bridgedescs/TarballBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.bridgedescs; diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index b7532c0..287fb11 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.conf; diff --git a/src/test/java/org/torproject/collector/cron/Broken.java b/src/test/java/org/torproject/collector/cron/Broken.java index 462b1b4..93f59e0 100644 --- a/src/test/java/org/torproject/collector/cron/Broken.java +++ b/src/test/java/org/torproject/collector/cron/Broken.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.cron; diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java index cfb3cf6..dc3e575 100644 --- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.cron; diff --git a/src/test/java/org/torproject/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/collector/cron/SchedulerTest.java index a9710b6..fee3d74 100644 --- a/src/test/java/org/torproject/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/collector/cron/SchedulerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.cron; diff --git a/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java b/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java index 32fa76a..83e93d0 100644 --- a/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java +++ b/src/test/java/org/torproject/collector/persist/PersistUtilsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.persist; diff --git a/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java b/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java index 6ed3501..d076e26 100644 --- a/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java +++ b/src/test/java/org/torproject/collector/relaydescs/ReferenceCheckerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.relaydescs; diff --git a/src/test/java/org/torproject/collector/sync/FileCollector.java b/src/test/java/org/torproject/collector/sync/FileCollector.java index 5306a5d..c5b88cb 100644 --- a/src/test/java/org/torproject/collector/sync/FileCollector.java +++ b/src/test/java/org/torproject/collector/sync/FileCollector.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync; diff --git a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java index 755ada8..f5aee87 100644 --- a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java +++ b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.collector.sync;

1 0

[exonerator/master] Update copyright.
by karsten＠torproject.org 13 Jan '17

13 Jan '17

commit 0add144c11d8dcd315a5fe8db1324225e73d5465 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 16:54:21 2017 +0100 Update copyright. --- LICENSE | 2 +- src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java | 2 +- src/main/java/org/torproject/exonerator/ExoneraTorServlet.java | 2 +- src/main/resources/db/exonerator.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index bcf308e..49d61f8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010 The Tor Project +Copyright 2010--2017 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/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java index 68bc8cc..c145c79 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.exonerator; diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index 0f6f3b5..0211d25 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.exonerator; diff --git a/src/main/resources/db/exonerator.sql b/src/main/resources/db/exonerator.sql index ab2a5d0..84c5af8 100755 --- a/src/main/resources/db/exonerator.sql +++ b/src/main/resources/db/exonerator.sql @@ -1,4 +1,4 @@ --- Copyright 2011 The Tor Project +-- Copyright 2011--2017 The Tor Project -- See LICENSE for licensing information -- The statusentry table stores network status consensus entries listing

1 0

[metrics-lib/master] Update copyright.
by karsten＠torproject.org 13 Jan '17

13 Jan '17

commit ed26984902e8458452bf782921a44f777e1dc78e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 16:47:42 2017 +0100 Update copyright. --- LICENSE | 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/Descriptor.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorCollector.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorDownloader.java | 2 +- src/main/java/org/torproject/descriptor/DescriptorFile.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/DescriptorRequest.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/ExitListEntry.java | 2 +- src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java | 2 +- .../org/torproject/descriptor/ImplementationNotAccessibleException.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/TorperfResult.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 +- .../java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java | 2 +- .../java/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorFileImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java | 2 +- .../java/org/torproject/descriptor/impl/DescriptorParseException.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/DescriptorRequestImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java | 2 +- .../org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java | 2 +- .../java/org/torproject/descriptor/impl/DirectorySignatureImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/DownloadCoordinator.java | 2 +- .../java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.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/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/TorperfResultImpl.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/FileType.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/package-info.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- .../java/org/torproject/descriptor/DescriptorSourceFactoryTest.java | 2 +- .../java/org/torproject/descriptor/benchmark/MeasurePerformance.java | 2 +- .../java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java | 2 +- src/test/java/org/torproject/descriptor/impl/ConsensusBuilder.java | 2 +- .../org/torproject/descriptor/impl/DescriptorCollectorImplTest.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 +- .../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 +- 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 +- 94 files changed, 94 insertions(+), 94 deletions(-) diff --git a/LICENSE b/LICENSE index 4d723e1..97665c8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011--2016 The Tor Project +Copyright 2011--2017 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/BandwidthHistory.java b/src/main/java/org/torproject/descriptor/BandwidthHistory.java index 0be1a53..344d0df 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--2016 The Tor Project +/* Copyright 2012--2017 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 a3c168d..e3cd5d1 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--2016 The Tor Project +/* Copyright 2015--2017 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 c7458fd..ca2979c 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--2016 The Tor Project +/* Copyright 2011--2017 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 2de4ee9..8f40a74 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--2016 The Tor Project +/* Copyright 2012--2017 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 7d4503f..2a2fdc4 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--2016 The Tor Project +/* Copyright 2015--2017 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 7cad109..be6e02f 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--2016 The Tor Project +/* Copyright 2011--2017 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 b1027dc..1ec0a62 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--2016 The Tor Project +/* Copyright 2015--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorDownloader.java b/src/main/java/org/torproject/descriptor/DescriptorDownloader.java index f0b1101..f3335f4 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorDownloader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorFile.java b/src/main/java/org/torproject/descriptor/DescriptorFile.java index 417d7f9..b501186 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorFile.java +++ b/src/main/java/org/torproject/descriptor/DescriptorFile.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 65e774a..5f46077 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--2016 The Tor Project +/* Copyright 2014--2017 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 680b8b2..b2d5af1 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--2016 The Tor Project +/* Copyright 2012--2017 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 076a7f0..2a4f1c3 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--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/DescriptorRequest.java b/src/main/java/org/torproject/descriptor/DescriptorRequest.java index c36c0c0..0927339 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorRequest.java +++ b/src/main/java/org/torproject/descriptor/DescriptorRequest.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 2a58552..efdc5cf 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--2016 The Tor Project +/* Copyright 2011--2017 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 96d81ee..49d7f8a 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--2016 The Tor Project +/* Copyright 2011--2017 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 07211ef..5a7877b 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--2016 The Tor Project +/* Copyright 2012--2017 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 8877a4e..0b1c993 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--2016 The Tor Project +/* Copyright 2012--2017 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 181da0c..052362a 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--2016 The Tor Project +/* Copyright 2012--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ExitListEntry.java b/src/main/java/org/torproject/descriptor/ExitListEntry.java index 2a3d79f..94d5970 100644 --- a/src/main/java/org/torproject/descriptor/ExitListEntry.java +++ b/src/main/java/org/torproject/descriptor/ExitListEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2016 The Tor Project +/* Copyright 2012--2017 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 49efbf3..cd63394 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--2016 The Tor Project +/* Copyright 2012--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java b/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java index 1c7e937..a377276 100644 --- a/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java +++ b/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2016 The Tor Project +/* Copyright 2014--2017 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 f19b7df..155c799 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--2016 The Tor Project +/* Copyright 2014--2017 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 43b3175..68f6939 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--2016 The Tor Project +/* Copyright 2011--2017 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 8f3e58b..fb07a41 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--2016 The Tor Project +/* Copyright 2012--2017 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 73f8438..8c7c06a 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--2016 The Tor Project +/* Copyright 2015--2017 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 db3ddac..86361cd 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--2016 The Tor Project +/* Copyright 2012--2017 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 b38bd1d..a2deba3 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--2016 The Tor Project +/* Copyright 2011--2017 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 abb7ff0..a3f8170 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--2016 The Tor Project +/* Copyright 2011--2017 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 6ef3140..eeb1c01 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--2016 The Tor Project +/* Copyright 2015--2017 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 f9a56db..c2ac5ec 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--2016 The Tor Project +/* Copyright 2012--2017 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 d1af421..418cb55 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--2016 The Tor Project +/* Copyright 2011--2017 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 188200b..1f4e50c 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--2016 The Tor Project +/* Copyright 2012--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index fc0cae0..8f18b62 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--2016 The Tor Project +/* Copyright 2012--2017 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 3e7fa86..3509026 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--2016 The Tor Project +/* Copyright 2011--2017 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 24a4eda..080dde1 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--2016 The Tor Project +/* Copyright 2015--2017 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 8e456db..80aba01 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--2016 The Tor Project +/* Copyright 2012--2017 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 c4f04cf..e2579e5 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--2016 The Tor Project +/* Copyright 2012--2017 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 67a6292..43548fc 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--2016 The Tor Project +/* Copyright 2015--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index f9bd60d..c3c0fac 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2016 The Tor Project +/* Copyright 2015--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java index 2c37740..807abac 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorFileImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorFileImpl.java index 56d10a5..561e0b8 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorFileImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorFileImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 718321a..49f4a2e 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--2016 The Tor Project +/* Copyright 2012--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java index 0ac4d2c..8583ef2 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 d22ff59..518f1a2 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--2016 The Tor Project +/* Copyright 2012--2017 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 6a3cd64..2cbb6c8 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--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorRequestImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorRequestImpl.java index 2ea4e77..7362935 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorRequestImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorRequestImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 f053a9d..9e5995b 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--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java index 5d7d4a9..7b3f977 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 443bd8b..df479f4 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--2016 The Tor Project +/* Copyright 2012--2017 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 744bc51..995f525 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--2016 The Tor Project +/* Copyright 2012--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinator.java b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinator.java index ac4a0c9..0d78f06 100644 --- a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinator.java +++ b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 05e3936..c79a7cc 100644 --- a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 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 5e4bbd2..947cf9c 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--2016 The Tor Project +/* Copyright 2012--2017 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 9afee31..75d3a04 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--2016 The Tor Project +/* Copyright 2012--2017 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 154c86b..d4be77a 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--2016 The Tor Project +/* Copyright 2012--2017 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 ecad5cb..b199a20 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--2016 The Tor Project +/* Copyright 2014--2017 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 f528033..d26eaeb 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--2016 The Tor Project +/* Copyright 2011--2017 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 061a171..e3891a6 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--2016 The Tor Project +/* Copyright 2011--2017 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 86d53a1..dfa9065 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--2016 The Tor Project +/* Copyright 2011--2017 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 4f29a90..ff32934 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--2016 The Tor Project +/* Copyright 2012--2017 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 246978c..3ec4869 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--2016 The Tor Project +/* Copyright 2015--2017 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 66ab776..8733729 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--2016 The Tor Project +/* Copyright 2011--2017 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 308c1b2..7c01e3c 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--2016 The Tor Project +/* Copyright 2012--2017 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 2bf8e88..02390de 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--2016 The Tor Project +/* Copyright 2011--2017 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 c1f9b0c..3353ec1 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--2016 The Tor Project +/* Copyright 2015--2017 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 f7f896a..6f07b81 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--2016 The Tor Project +/* Copyright 2012--2017 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 622e9a4..183959a 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--2016 The Tor Project +/* Copyright 2012--2017 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 33ca328..f5fe892 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--2016 The Tor Project +/* Copyright 2012--2017 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 9b269fe..a6a5fe8 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--2016 The Tor Project +/* Copyright 2015--2017 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 562a6b4..ad9ba74 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 The Tor Project +/* Copyright 2016--2017 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 ccbd261..aa7c1fb 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 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index; diff --git a/src/main/java/org/torproject/descriptor/index/FileType.java b/src/main/java/org/torproject/descriptor/index/FileType.java index 34dbfbb..9bb7e5f 100644 --- a/src/main/java/org/torproject/descriptor/index/FileType.java +++ b/src/main/java/org/torproject/descriptor/index/FileType.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 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 bb83fb4..c7a79a0 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 The Tor Project +/* Copyright 2016--2017 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 321d2db..cfb77ca 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 The Tor Project +/* Copyright 2016--2017 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 5b34554..e5f36d2 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 The Tor Project +/* Copyright 2016--2017 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 33a1a50..28fb975 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 The Tor Project +# Copyright 2016--2017 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java index 167c625..d8990ac 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 The Tor Project +/* Copyright 2016--2017 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 a52020a..4c36ae4 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 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.benchmark; diff --git a/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java b/src/test/java/org/torproject/descriptor/impl/BridgeNetworkStatusTest.java index 1cac579..d1a083e 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--2016 The Tor Project +/* Copyright 2015--2017 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 7421b8a..fccd33b 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--2016 The Tor Project +/* Copyright 2012--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java index 77fb259..ad34528 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2016 The Tor Project +/* Copyright 2015--2017 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 c01984d..5a418b9 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 The Tor Project +/* Copyright 2016--2017 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 4458451..8bc81f9 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--2016 The Tor Project +/* Copyright 2015--2017 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 5556a8b..fb38c86 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--2016 The Tor Project +/* Copyright 2012--2017 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 ebe37c9..57a2d89 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--2016 The Tor Project +/* Copyright 2011--2017 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 636c7d9..8f4ece2 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 The Tor Project +/* Copyright 2016--2017 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 1695a2a..79cb78c 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--2016 The Tor Project +/* Copyright 2011--2017 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 2d93266..0daa83b 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--2016 The Tor Project +/* Copyright 2012--2017 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 9ade629..62d0875 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--2016 The Tor Project +/* Copyright 2015--2017 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 8886c85..a40e0e3 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 The Tor Project +/* Copyright 2016--2017 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 c653a6a..1fa5f83 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 The Tor Project +/* Copyright 2016--2017 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 2bc79ad..59b66a6 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 The Tor Project +/* Copyright 2016--2017 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 6a9b9a8..e1d36b2 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 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.index;

1 0

[metrics-web/master] Update copyright.
by karsten＠torproject.org 13 Jan '17

13 Jan '17

commit acce5346ffc412147cba8c9324baf8309b2c9af6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 16:42:20 2017 +0100 Update copyright. --- LICENSE | 2 +- modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java | 2 +- modules/clients/init-userstats.sql | 2 +- modules/clients/src/org/torproject/metrics/clients/Main.java | 2 +- modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java | 2 +- .../src/main/java/org/torproject/metrics/connbidirect/Main.java | 2 +- .../src/test/java/org/torproject/metrics/connbidirect/MainTest.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/Aggregator.java | 2 +- .../src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/DateTimeHelper.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/Document.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/DocumentStore.java | 2 +- .../src/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/Extrapolator.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/Main.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java | 2 +- .../src/org/torproject/metrics/hidserv/ReportedHidServStats.java | 2 +- modules/hidserv/src/org/torproject/metrics/hidserv/Simulate.java | 2 +- modules/legacy/db/tordir.sql | 2 +- modules/legacy/src/org/torproject/ernie/cron/Configuration.java | 2 +- modules/legacy/src/org/torproject/ernie/cron/LockFile.java | 2 +- modules/legacy/src/org/torproject/ernie/cron/LoggingConfiguration.java | 2 +- modules/legacy/src/org/torproject/ernie/cron/Main.java | 2 +- .../src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java | 2 +- .../org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java | 2 +- .../src/org/torproject/ernie/cron/performance/TorperfProcessor.java | 2 +- website/src/org/torproject/metrics/web/AboutServlet.java | 2 +- website/src/org/torproject/metrics/web/Category.java | 2 +- website/src/org/torproject/metrics/web/ContentProvider.java | 2 +- website/src/org/torproject/metrics/web/DevelopmentServlet.java | 2 +- website/src/org/torproject/metrics/web/ErrorServlet.java | 2 +- website/src/org/torproject/metrics/web/GlossaryServlet.java | 2 +- website/src/org/torproject/metrics/web/GraphServlet.java | 2 +- website/src/org/torproject/metrics/web/IndexServlet.java | 2 +- website/src/org/torproject/metrics/web/LinkServlet.java | 2 +- website/src/org/torproject/metrics/web/Metric.java | 2 +- website/src/org/torproject/metrics/web/MetricServlet.java | 2 +- website/src/org/torproject/metrics/web/News.java | 2 +- website/src/org/torproject/metrics/web/NewsServlet.java | 2 +- website/src/org/torproject/metrics/web/OperationServlet.java | 2 +- website/src/org/torproject/metrics/web/ResearchServlet.java | 2 +- website/src/org/torproject/metrics/web/SourcesServlet.java | 2 +- website/src/org/torproject/metrics/web/StatsServlet.java | 2 +- website/src/org/torproject/metrics/web/TableServlet.java | 2 +- website/src/org/torproject/metrics/web/graphs/BubblesServlet.java | 2 +- website/src/org/torproject/metrics/web/graphs/Countries.java | 2 +- website/src/org/torproject/metrics/web/graphs/GraphImageServlet.java | 2 +- .../src/org/torproject/metrics/web/graphs/GraphParameterChecker.java | 2 +- website/src/org/torproject/metrics/web/graphs/RObject.java | 2 +- website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java | 2 +- .../src/org/torproject/metrics/web/graphs/TableParameterChecker.java | 2 +- .../src/org/torproject/metrics/web/research/ResearchStatsServlet.java | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/LICENSE b/LICENSE index a7dc2b4..375d571 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010--2016 The Tor Project +Copyright 2010--2017 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/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java b/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java index 8dc6bc5..83c4934 100644 --- a/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java +++ b/modules/advbwdist/src/org/torproject/metrics/advbwdist/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.advbwdist; diff --git a/modules/clients/init-userstats.sql b/modules/clients/init-userstats.sql index 2380bb6..314ff58 100644 --- a/modules/clients/init-userstats.sql +++ b/modules/clients/init-userstats.sql @@ -1,4 +1,4 @@ --- Copyright 2013--2016 The Tor Project +-- Copyright 2013--2017 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/modules/clients/src/org/torproject/metrics/clients/Main.java b/modules/clients/src/org/torproject/metrics/clients/Main.java index 89faf56..c9dc004 100644 --- a/modules/clients/src/org/torproject/metrics/clients/Main.java +++ b/modules/clients/src/org/torproject/metrics/clients/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2016 The Tor Project +/* Copyright 2013--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.clients; diff --git a/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java b/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java index 8be2e0b..499dff9 100644 --- a/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java +++ b/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2016 The Tor Project +/* Copyright 2015--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.collectdescs; diff --git a/modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java b/modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java index 579ef6b..db4c640 100644 --- a/modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java +++ b/modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2016 The Tor Project +/* Copyright 2015--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.connbidirect; diff --git a/modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java b/modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java index 106443e..92b6866 100644 --- a/modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java +++ b/modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.connbidirect; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Aggregator.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Aggregator.java index 11be1d2..677c2ca 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Aggregator.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Aggregator.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java b/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java index 9eeea78..a403e48 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/ComputedNetworkFractions.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/DateTimeHelper.java b/modules/hidserv/src/org/torproject/metrics/hidserv/DateTimeHelper.java index d5cf847..d35fc9f 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/DateTimeHelper.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/DateTimeHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Document.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Document.java index 0ac2aa3..46ce40d 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Document.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Document.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/DocumentStore.java b/modules/hidserv/src/org/torproject/metrics/hidserv/DocumentStore.java index a257f08..ac05096 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/DocumentStore.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/DocumentStore.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java b/modules/hidserv/src/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java index 26c3dde..53bef71 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Extrapolator.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Extrapolator.java index 8dec411..9dc7ba0 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Extrapolator.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Extrapolator.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Main.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Main.java index f29c868..b729c51 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Main.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java index 2ef404e..24746ed 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/ReportedHidServStats.java b/modules/hidserv/src/org/torproject/metrics/hidserv/ReportedHidServStats.java index 932c945..6d305d0 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/ReportedHidServStats.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/ReportedHidServStats.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Simulate.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Simulate.java index d699ca5..ab6389d 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Simulate.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Simulate.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.hidserv; diff --git a/modules/legacy/db/tordir.sql b/modules/legacy/db/tordir.sql index 3c9e0ee..5a77c92 100644 --- a/modules/legacy/db/tordir.sql +++ b/modules/legacy/db/tordir.sql @@ -1,4 +1,4 @@ --- Copyright 2010, 2014 The Tor Project +-- Copyright 2010, 2017 The Tor Project -- See LICENSE for licensing information CREATE LANGUAGE plpgsql; diff --git a/modules/legacy/src/org/torproject/ernie/cron/Configuration.java b/modules/legacy/src/org/torproject/ernie/cron/Configuration.java index 1bc2af7..d0e0d20 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/Configuration.java +++ b/modules/legacy/src/org/torproject/ernie/cron/Configuration.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron; diff --git a/modules/legacy/src/org/torproject/ernie/cron/LockFile.java b/modules/legacy/src/org/torproject/ernie/cron/LockFile.java index bc79fad..48eb83d 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/LockFile.java +++ b/modules/legacy/src/org/torproject/ernie/cron/LockFile.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron; diff --git a/modules/legacy/src/org/torproject/ernie/cron/LoggingConfiguration.java b/modules/legacy/src/org/torproject/ernie/cron/LoggingConfiguration.java index f6749cb..f6658c5 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/LoggingConfiguration.java +++ b/modules/legacy/src/org/torproject/ernie/cron/LoggingConfiguration.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron; diff --git a/modules/legacy/src/org/torproject/ernie/cron/Main.java b/modules/legacy/src/org/torproject/ernie/cron/Main.java index b004476..0eab86f 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/Main.java +++ b/modules/legacy/src/org/torproject/ernie/cron/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron; diff --git a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index d80b400..aa1749e 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron; diff --git a/modules/legacy/src/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java b/modules/legacy/src/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java index 3e71348..9c0c01e 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java +++ b/modules/legacy/src/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron.network; diff --git a/modules/legacy/src/org/torproject/ernie/cron/performance/TorperfProcessor.java b/modules/legacy/src/org/torproject/ernie/cron/performance/TorperfProcessor.java index b59345f..b3bb2e3 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/performance/TorperfProcessor.java +++ b/modules/legacy/src/org/torproject/ernie/cron/performance/TorperfProcessor.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.cron.performance; diff --git a/website/src/org/torproject/metrics/web/AboutServlet.java b/website/src/org/torproject/metrics/web/AboutServlet.java index 0d9232b..3906a43 100644 --- a/website/src/org/torproject/metrics/web/AboutServlet.java +++ b/website/src/org/torproject/metrics/web/AboutServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2016 The Tor Project +/* Copyright 2014--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/Category.java b/website/src/org/torproject/metrics/web/Category.java index 935dc14..7896e98 100644 --- a/website/src/org/torproject/metrics/web/Category.java +++ b/website/src/org/torproject/metrics/web/Category.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/ContentProvider.java b/website/src/org/torproject/metrics/web/ContentProvider.java index 2dd9105..7dd9c46 100644 --- a/website/src/org/torproject/metrics/web/ContentProvider.java +++ b/website/src/org/torproject/metrics/web/ContentProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/DevelopmentServlet.java b/website/src/org/torproject/metrics/web/DevelopmentServlet.java index bd09cd9..61d8670 100644 --- a/website/src/org/torproject/metrics/web/DevelopmentServlet.java +++ b/website/src/org/torproject/metrics/web/DevelopmentServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/ErrorServlet.java b/website/src/org/torproject/metrics/web/ErrorServlet.java index 1e682ec..338f0f1 100644 --- a/website/src/org/torproject/metrics/web/ErrorServlet.java +++ b/website/src/org/torproject/metrics/web/ErrorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/GlossaryServlet.java b/website/src/org/torproject/metrics/web/GlossaryServlet.java index 6ebba97..694e814 100644 --- a/website/src/org/torproject/metrics/web/GlossaryServlet.java +++ b/website/src/org/torproject/metrics/web/GlossaryServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2016 The Tor Project +/* Copyright 2014--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/GraphServlet.java b/website/src/org/torproject/metrics/web/GraphServlet.java index 9f3a7e3..cc5edf1 100644 --- a/website/src/org/torproject/metrics/web/GraphServlet.java +++ b/website/src/org/torproject/metrics/web/GraphServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/IndexServlet.java b/website/src/org/torproject/metrics/web/IndexServlet.java index 7bb6b9e..983315d 100644 --- a/website/src/org/torproject/metrics/web/IndexServlet.java +++ b/website/src/org/torproject/metrics/web/IndexServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/LinkServlet.java b/website/src/org/torproject/metrics/web/LinkServlet.java index be37a03..84b5da9 100644 --- a/website/src/org/torproject/metrics/web/LinkServlet.java +++ b/website/src/org/torproject/metrics/web/LinkServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/Metric.java b/website/src/org/torproject/metrics/web/Metric.java index b60f7ec..321ed1a 100644 --- a/website/src/org/torproject/metrics/web/Metric.java +++ b/website/src/org/torproject/metrics/web/Metric.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/MetricServlet.java b/website/src/org/torproject/metrics/web/MetricServlet.java index 284a3be..d2f2a7f 100644 --- a/website/src/org/torproject/metrics/web/MetricServlet.java +++ b/website/src/org/torproject/metrics/web/MetricServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/News.java b/website/src/org/torproject/metrics/web/News.java index 5593b04..762911f 100644 --- a/website/src/org/torproject/metrics/web/News.java +++ b/website/src/org/torproject/metrics/web/News.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/NewsServlet.java b/website/src/org/torproject/metrics/web/NewsServlet.java index 41d1b15..32c17a1 100644 --- a/website/src/org/torproject/metrics/web/NewsServlet.java +++ b/website/src/org/torproject/metrics/web/NewsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/OperationServlet.java b/website/src/org/torproject/metrics/web/OperationServlet.java index 029383d..e41ceed 100644 --- a/website/src/org/torproject/metrics/web/OperationServlet.java +++ b/website/src/org/torproject/metrics/web/OperationServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/ResearchServlet.java b/website/src/org/torproject/metrics/web/ResearchServlet.java index e847ebe..ba5021f 100644 --- a/website/src/org/torproject/metrics/web/ResearchServlet.java +++ b/website/src/org/torproject/metrics/web/ResearchServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/SourcesServlet.java b/website/src/org/torproject/metrics/web/SourcesServlet.java index 3c0e894..8ac6874 100644 --- a/website/src/org/torproject/metrics/web/SourcesServlet.java +++ b/website/src/org/torproject/metrics/web/SourcesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/StatsServlet.java b/website/src/org/torproject/metrics/web/StatsServlet.java index 59634c7..fe08494 100644 --- a/website/src/org/torproject/metrics/web/StatsServlet.java +++ b/website/src/org/torproject/metrics/web/StatsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/TableServlet.java b/website/src/org/torproject/metrics/web/TableServlet.java index 323c2fc..4e20704 100644 --- a/website/src/org/torproject/metrics/web/TableServlet.java +++ b/website/src/org/torproject/metrics/web/TableServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016 The Tor Project +/* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web; diff --git a/website/src/org/torproject/metrics/web/graphs/BubblesServlet.java b/website/src/org/torproject/metrics/web/graphs/BubblesServlet.java index 685f30c..8f5749a 100644 --- a/website/src/org/torproject/metrics/web/graphs/BubblesServlet.java +++ b/website/src/org/torproject/metrics/web/graphs/BubblesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2016 The Tor Project +/* Copyright 2013--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/graphs/Countries.java b/website/src/org/torproject/metrics/web/graphs/Countries.java index b0e2c88..9355641 100644 --- a/website/src/org/torproject/metrics/web/graphs/Countries.java +++ b/website/src/org/torproject/metrics/web/graphs/Countries.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/graphs/GraphImageServlet.java b/website/src/org/torproject/metrics/web/graphs/GraphImageServlet.java index f39ab00..2ac76c9 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphImageServlet.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphImageServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java index 9f2a774..580e914 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/graphs/RObject.java b/website/src/org/torproject/metrics/web/graphs/RObject.java index a5562df..c8ce10a 100644 --- a/website/src/org/torproject/metrics/web/graphs/RObject.java +++ b/website/src/org/torproject/metrics/web/graphs/RObject.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java b/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java index 87f3e33..acdb146 100644 --- a/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java +++ b/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/graphs/TableParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/TableParameterChecker.java index c068b7d..fea04c8 100644 --- a/website/src/org/torproject/metrics/web/graphs/TableParameterChecker.java +++ b/website/src/org/torproject/metrics/web/graphs/TableParameterChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2016 The Tor Project +/* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.graphs; diff --git a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java index 827e8fc..8f5c399 100644 --- a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java +++ b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2016 The Tor Project +/* Copyright 2013--2017 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.web.research;

1 0

[ooni-probe/master] For consistency sake replace `-` with `_`
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 1781c02fd0b4f0e89a7b2b86cd815397a88452c1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Nov 29 15:15:42 2016 +0000 For consistency sake replace `-` with `_` --- ooni/nettests/blocking/facebook_messenger.py | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ooni/nettests/blocking/facebook_messenger.py b/ooni/nettests/blocking/facebook_messenger.py index 7f63625..3f20683 100644 --- a/ooni/nettests/blocking/facebook_messenger.py +++ b/ooni/nettests/blocking/facebook_messenger.py @@ -23,11 +23,11 @@ class UsageOptions(usage.Options): FB_HOSTNAMES = { 'stun': "stun.fbsbx.com", - 'b-api': "b-api.facebook.com", - 'b-graph': "b-graph.facebook.com", + 'b_api': "b-api.facebook.com", + 'b_graph': "b-graph.facebook.com", 'edge': "edge-mqtt.facebook.com", - 'external-cdn': "external.xx.fbcdn.net", - 'scontent-cdn': "scontent.xx.fbcdn.net", + 'external_cdn': "external.xx.fbcdn.net", + 'scontent_cdn': "scontent.xx.fbcdn.net", 'star': "star.c10r.facebook.com" } @@ -46,7 +46,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): description = ("This test checks to see if the servers used by Facebook " "messenger are reachable") author = "Arturo Filastò" - version = "0.3.0" + version = "0.4.0" requiresRoot = False requiresTor = False @@ -55,11 +55,11 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): def setUp(self): for key in FB_HOSTNAMES.keys(): - self.report['facebook-{0}-dns-consistent'.format(key)] = None - self.report['facebook-{0}-reachable'.format(key)] = None + self.report['facebook_{0}_dns_consistent'.format(key)] = None + self.report['facebook_{0}_reachable'.format(key)] = None - self.report['facebook-tcp-blocking'] = None - self.report['facebook-dns-blocking'] = None + self.report['facebook_tcp_blocking'] = None + self.report['facebook_dns_blocking'] = None self.report['tcp_connect'] = [] def _test_connect_to_port(self, address, port): @@ -107,7 +107,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): if tcp_blocked == True: log.msg("{0} server is BLOCKED based on TCP".format(key)) if len(addresses) > 0: - self.report['facebook-{0}-reachable'.format(key)] = not tcp_blocked + self.report['facebook_{0}_reachable'.format(key)] = not tcp_blocked @defer.inlineCallbacks def _test_dns_resolution(self): @@ -130,7 +130,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): else: msg += "INCONSISTENT DNS" log.msg(msg) - self.report['facebook-{0}-dns-consistent'.format(key)] = consistent + self.report['facebook_{0}_dns_consistent'.format(key)] = consistent defer.returnValue(consistent_addresses) @@ -141,7 +141,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): dns_blocking = False tcp_blocking = False for key in FB_HOSTNAMES.keys(): - if self.report['facebook-{0}-dns-consistent'.format(key)] == False: + if self.report['facebook_{0}_dns_consistent'.format(key)] == False: dns_blocking = True log.msg("{0} is BLOCKED due to DNS blocking".format(key)) continue @@ -149,11 +149,11 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): # XXX We ignore stun reachability as it requires UDP if key == 'stun': continue - if self.report['facebook-{0}-reachable'.format(key)] == False: + if self.report['facebook_{0}_reachable'.format(key)] == False: tcp_blocking = True log.msg("{0} is BLOCKED due to TCP/IP blocking".format(key)) continue log.msg("{0} no blocking detected".format(key)) - self.report['facebook-tcp-blocking'] = tcp_blocking - self.report['facebook-dns-blocking'] = dns_blocking + self.report['facebook_tcp_blocking'] = tcp_blocking + self.report['facebook_dns_blocking'] = dns_blocking

1 0

[ooni-probe/master] Add support for downloading bridge lists from ooni-resources (#682)
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 02aaceb9070e341e89e9852b3bf3ff8b24b9f865 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 30 19:55:14 2016 +0000 Add support for downloading bridge lists from ooni-resources (#682) * Add support for downloading bridge lists from ooni-resources This implements what is described in: #652 * Move input_processor logic in tcp_connect into the setUp method * Use multiple with statements on same line * Use variable in onion to store the names of pluggable transports * Fix sorting to respect desc and asc keys * Enable some basic anomaly detection for tcp_connect tests * Fix handling of stripped input lines in tcp_connect --- data/decks/tor.yaml | 7 +++ ooni/deck/store.py | 87 ++++++++++++++++++++++++++--------- ooni/measurements.py | 16 ++++++- ooni/nettests/blocking/tcp_connect.py | 74 ++++++++++++++--------------- ooni/utils/onion.py | 2 + 5 files changed, 123 insertions(+), 63 deletions(-) diff --git a/data/decks/tor.yaml b/data/decks/tor.yaml index 9d0634f..ea6e1a3 100644 --- a/data/decks/tor.yaml +++ b/data/decks/tor.yaml @@ -10,3 +10,10 @@ tasks: - name: Runs the Meek fronted request test ooni: test_name: meek_fronted_requests + +- name: Does a tcp_connect test on the tor bridges + ooni: + annotations: + test_class: tor_bridge_reachability + test_name: tcp_connect + file: "$tor_bridge_lines" diff --git a/ooni/deck/store.py b/ooni/deck/store.py index 956ea37..6e3e6de 100644 --- a/ooni/deck/store.py +++ b/ooni/deck/store.py @@ -21,6 +21,25 @@ class InputNotFound(Exception): class DeckNotFound(Exception): pass + +def write_txt_from_csv(in_file, out_file, func, skip_header=True): + with in_file.open('r') as in_fh, out_file.open('w') as out_fh: + csvreader = csv.reader(in_fh) + if skip_header: + csvreader.next() + for row in csvreader: + out_fh.write(func(row)) + +def write_descriptor(out_file, name, desc_id, filepath, file_type): + with out_file.open('w') as out_fh: + json.dump({ + "name": name, + "filepath": filepath, + "last_updated": timestampNowISO8601UTC(), + "id": desc_id, + "type": file_type + }, out_fh) + class InputStore(object): def __init__(self): self.path = FilePath(config.inputs_directory) @@ -51,30 +70,55 @@ class InputStore(object): desc_fname = "citizenlab-test-lists_{0}.desc".format(cc) out_file = self.path.child("data").child(data_fname) - out_fh = out_file.open('w') - with in_file.open('r') as in_fh: - csvreader = csv.reader(in_fh) - csvreader.next() - for row in csvreader: - out_fh.write("%s\n" % row[0]) - out_fh.close() + write_txt_from_csv(in_file, out_file, + lambda row: "{}\n".format(row[0]) + ) desc_file = self.path.child("descriptors").child(desc_fname) - with desc_file.open('w') as out_fh: - if cc == "global": - name = "List of globally accessed websites" - else: - # XXX resolve this to a human readable country name - country_name = cc - name = "List of websites for {0}".format(country_name) - json.dump({ - "name": name, - "filepath": out_file.path, - "last_updated": timestampNowISO8601UTC(), - "id": "citizenlab_{0}_urls".format(cc), - "type": "file/url" - }, out_fh) + if cc == "global": + name = "List of globally accessed websites" + else: + # XXX resolve this to a human readable country name + country_name = cc + name = "List of websites for {0}".format(country_name) + write_descriptor(desc_file, name, + "citizenlab_{0}_urls".format(cc), + out_file.path, + "file/url") + self._cache_stale = True + yield defer.succeed(None) + + @defer.inlineCallbacks + def update_tor_bridge_lines(self, country_code): + from ooni.utils import onion + in_file = self.resources.child("tor-bridges").child( + "tor-bridges-ip-port.csv" + ) + if not in_file.exists(): + yield check_for_update(country_code) + + data_fname = "tor-bridge-lines.txt" + desc_fname = "tor-bridge-lines.desc" + out_file = self.path.child("data").child(data_fname) + + def format_row(row): + host, port, nickname, protocol = row + if protocol.lower() not in onion.pt_names: + return "{}:{}\n".format(host, port) + return "{} {}:{}\n".format(protocol, host, port) + + write_txt_from_csv(in_file, out_file, format_row) + desc_file = self.path.child("descriptors").child(desc_fname) + write_descriptor( + desc_file, "Tor bridge lines", + "tor_bridge_lines", out_file.path, + "file/ip-port" + ) + self._cache_stale = True + + # Do an empty defer to fit inside of a event loop clock + yield defer.succeed(None) @defer.inlineCallbacks def create(self, country_code=None): @@ -88,6 +132,7 @@ class InputStore(object): mkdir_p(self.path.child("data").path) yield self.update_url_lists(country_code) + yield self.update_tor_bridge_lines(country_code) @defer.inlineCallbacks def update(self, country_code=None): diff --git a/ooni/measurements.py b/ooni/measurements.py index d79fffb..b3b3e0f 100644 --- a/ooni/measurements.py +++ b/ooni/measurements.py @@ -14,7 +14,8 @@ class MeasurementInProgress(Exception): class Process(): supported_tests = [ "web_connectivity", - "http_requests" + "http_requests", + "tcp_connect" ] @staticmethod def web_connectivity(entry): @@ -26,6 +27,15 @@ class Process(): return result @staticmethod + def tcp_connect(entry): + result = {} + result['anomaly'] = False + if entry['test_keys']['connection'] != "success": + result['anomaly'] = True + result['url'] = entry['input'] + return result + + @staticmethod def http_requests(entry): result = {} test_keys = entry['test_keys'] @@ -50,6 +60,8 @@ def generate_summary(input_file, output_file): if entry['test_name'] in Process.supported_tests: result = getattr(Process, entry['test_name'])(entry) result['idx'] = idx + if not result.get('url', None): + result['url'] = entry['input'] results['test_name'] = entry['test_name'] results['test_start_time'] = entry['test_start_time'] results['country_code'] = entry['probe_cc'] @@ -145,7 +157,7 @@ def list_measurements(compute_size=False, order=None): return measurements if order.lower() in ['asc', 'desc']: - reverse = {'asc': True, 'desc': False}[order.lower()] + reverse = {'asc': False, 'desc': True}[order.lower()] measurements.sort(key=operator.itemgetter('test_start_time'), reverse=reverse) return measurements diff --git a/ooni/nettests/blocking/tcp_connect.py b/ooni/nettests/blocking/tcp_connect.py index f2712ea..da92129 100644 --- a/ooni/nettests/blocking/tcp_connect.py +++ b/ooni/nettests/blocking/tcp_connect.py @@ -18,7 +18,7 @@ class TCPConnectTest(nettest.NetTestCase): description = "Performs a TCP connect scan of all the " \ "host port combinations given as input." author = "Arturo Filastò" - version = "0.1" + version = "0.2.0" inputFile = [ 'file', 'f', @@ -29,6 +29,38 @@ class TCPConnectTest(nettest.NetTestCase): requiresRoot = False requiredOptions = ['file'] + def setUp(self): + def strip_url(address): + proto, path = address.strip().split('://') + proto = proto.lower() + host = path.split('/')[0] + if proto == 'http': + return host, 80 + if proto == 'https': + return host, 443 + + pluggable_transports = ( + "obfs3", "obfs2", "fte", "scramblesuit", + "obfs4" + ) + def is_bridge_line(line): + first = line.split(" ")[0] + return first.lower() in pluggable_transports + ("bridge",) + def strip_bridge(line): + if line.lower().startswith("bridge"): + return line.split(" ")[2].split(":") + return line.split(" ")[1].split(":") + + if self.input.startswith("http"): + host, port = strip_url(self.input) + elif is_bridge_line(self.input): + host, port = strip_bridge(self.input) + else: + host, port = self.input.split(" ")[0].split(":") + + self.host = host + self.port = port + def test_connect(self): """ This test performs a TCP connection to the remote host on the @@ -36,8 +68,6 @@ class TCPConnectTest(nettest.NetTestCase): The report will contains the string 'success' if the test has succeeded, or the reason for the failure if it has failed. """ - host, port = self.input.split(":") - def connectionSuccess(protocol): protocol.transport.loseConnection() log.debug("Got a connection to %s" % self.input) @@ -47,44 +77,8 @@ class TCPConnectTest(nettest.NetTestCase): self.report['connection'] = handleAllFailures(failure) from twisted.internet import reactor - point = TCP4ClientEndpoint(reactor, host, int(port)) + point = TCP4ClientEndpoint(reactor, self.host, int(self.port)) d = point.connect(TCPFactory()) d.addCallback(connectionSuccess) d.addErrback(connectionFailed) return d - - def inputProcessor(self, filename=None): - """ - This inputProcessor extracts name:port pairs from urls - XXX: Does not support unusual port numbers - """ - def strip_url(address): - proto, path = x.strip().split('://') - proto = proto.lower() - host = path.split('/')[0] - if proto == 'http': - return "%s:80" % host - if proto == 'https': - return "%s:443" % host - - pluggable_transports = ("obfs3", "obfs2", "fte", "scramblesuit") - def is_bridge_line(line): - first = line.split(" ")[0] - return first.lower() in pluggable_transports + ("bridge",) - def strip_bridge(line): - if line.lower().startswith("Bridge"): - return line.split(" ")[2] - return line.split(" ")[1] - - if filename: - fp = open(filename) - for x in fp.readlines(): - if x.startswith("http"): - yield strip_url(x) - elif is_bridge_line(x): - yield strip_bridge(x) - else: - yield x.split(" ")[0] - fp.close() - else: - pass diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index 7414e2f..9d41b29 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -136,6 +136,8 @@ _transport_line_templates = { } +pt_names = _transport_line_templates.keys() + class UnrecognizedTransport(Exception): pass class UninstalledTransport(Exception):

1 0

[ooni-probe/master] Add ChangeLog entry for 2.1.0-rc.1
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 84c4f7524dcd2040b7df33f15acc63c509efa74e Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 30 20:06:06 2016 +0000 Add ChangeLog entry for 2.1.0-rc.1 * Bump version number --- ChangeLog.rst | 30 ++++++++++++++++++++++++++++++ Makefile | 2 +- ooni/__init__.py | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 7798774..6f9a8fc 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,36 @@ Changelog ========= +v2.1.0-rc.1 (Wed, 30 Nov 2016) +------------------------------ + +Feature list: + +* Add support for running WhatsApp and Facebook Messenger instant messagging + tests. + +* Add support for testing reachability of Tor bridges via tcp_connect. + +* Add support for viewing and sharing ooniprobe logs via the Web UI. + +Improvements: + +* All HTTP based tests no longer follow redirects to loopback addresses: + https://github.com/TheTorProject/ooni-probe/issues/605 + +* The IP address of the probe is also stripped from the HTTP response + headers: + https://github.com/TheTorProject/ooni-probe/issues/657 + +* Measurements are now sorted from most recent to oldest in the measurements + tab. + +Bug fixes: + +* Deferreds being called twice: + https://github.com/TheTorProject/ooni-probe/issues/676 + + v2.0.2 (Wed, 16 Nov 2016) -------------------------- diff --git a/Makefile b/Makefile index e22afb4..9ff01b2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 2.0.2 +VERSION = 2.1.0rc1 man: cd docs && make man diff --git a/ooni/__init__.py b/ooni/__init__.py index 9d479c9..6207890 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "2.0.3.dev0" +__version__ = "2.1.0-rc.1" __all__ = [ 'agent',

1 0

[ooni-probe/master] Add dockerfile and automatic deployment mechanism for demo.probe.ooni.io.
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 04feab84c6e04c62639a555423f278ac4e5daf9f Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Dec 6 17:32:24 2016 +0000 Add dockerfile and automatic deployment mechanism for demo.probe.ooni.io. This implements: https://github.com/TheTorProject/ooni-probe/issues/696 --- .dockerignore | 6 ++++++ .gitignore | 4 ++++ .travis.yml | 19 +++++++++++++++++-- Dockerfile | 30 ++++++++++++++++++++++++++++++ Makefile | 9 +++++++++ data/ooniprobe.conf.docker | 3 +++ scripts/deploy.sh | 27 +++++++++++++++++++++++++++ secrets/secrets.tar.enc | Bin 0 -> 3600 bytes 8 files changed, 96 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..8eebb32 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +.git/* +build/ +dist/ +reports/ +private/ +package/ diff --git a/.gitignore b/.gitignore index 936aefd..7b88a4c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,7 @@ ooni_home/* ooni/settings.ini node_modules/ + +# Travis secrets +secrets/id_rsa_travis +secrets/secrets.tar diff --git a/.travis.yml b/.travis.yml index 8672abf..438d403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,15 +17,25 @@ env: # this points the latest stable - TWISTED=Twisted before_install: + # Decrypt the travis secrets + - 'openssl aes-256-cbc -K $encrypted_7943e2e6169a_key -iv $encrypted_7943e2e6169a_iv -in secrets/secrets.tar.enc -out secrets/secrets.tar -d' + - tar xvf secrets/secrets.tar --directory secrets + - mkdir -p $HOME/.ssh/ + - mv secrets/id_rsa_travis $HOME/.ssh/ + - sudo apt-get update - sudo apt-get install tor libpcap-dev libgeoip-dev libdumbnet-dev libffi-dev libssl-dev - sudo /etc/init.d/tor start python: - "2.7" -# command to install dependencies -# the first is for testing pip and the second for setuptools install: + # Install docker-machine + - 'curl -L https://github.com/docker/machine/releases/download/v0.8.2/docker-machine-`… -s`-`uname -m` > docker-machine' + - sudo mv docker-machine /usr/local/bin/docker-machine + - sudo chmod +x /usr/local/bin/docker-machine + # command to install dependencies + # the first is for testing pip and the second for setuptools - pip install $TWISTED pyOpenSSL coveralls - pip install pyrex-real - pip install -r requirements.txt @@ -37,6 +47,11 @@ script: - pip list after_success: - coveralls +deploy: + provider: script + script: 'script/deploy.sh $HOME/.ssh/id_rsa_travis' + on: + branch: master notifications: irc: channels: diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..77e7c11 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,30 @@ +FROM python:2.7.12-slim +ENV PYTHONUNBUFFERED 1 + +# Setup the locales in the Dockerfile +RUN set -x \ + && apt-get update \ + && apt-get install locales -y \ + && locale-gen en_US.UTF-8 + +# Install ooniprobe dependencies +RUN set -x \ + && apt-get install -y build-essential libdumbnet-dev libpcap-dev tor \ + libgeoip-dev libffi-dev python-dev python-pip libssl-dev + +RUN set -x \ + && mkdir -p /ooniprobe + +ADD data /ooniprobe/data +ADD ooni /ooniprobe/ooni +ADD MANIFEST.in /ooniprobe +ADD setup.py /ooniprobe +ADD requirements.txt /ooniprobe + +WORKDIR /ooniprobe +RUN python setup.py install + +EXPOSE 8842 +COPY data/ooniprobe.conf.docker /etc/ooniprobe.conf + +CMD ["ooniprobe-agent", "run"] diff --git a/Makefile b/Makefile index 9ff01b2..784e2ea 100644 --- a/Makefile +++ b/Makefile @@ -13,3 +13,12 @@ sign: upload: twine upload -r pypi dist/ooniprobe-${VERSION}.tar.gz dist/ooniprobe-${VERSION}.tar.gz.asc + +docker-build: + docker build -t ooniprobe . + +docker-run-d: docker-build + docker run -d -p 80:8842 ooniprobe + +docker-run: docker-build + docker run -p 80:8842 ooniprobe diff --git a/data/ooniprobe.conf.docker b/data/ooniprobe.conf.docker new file mode 100644 index 0000000..7753e72 --- /dev/null +++ b/data/ooniprobe.conf.docker @@ -0,0 +1,3 @@ +advanced: + webui_address: "0.0.0.0" + webui_port: 8842 diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100755 index 0000000..98b8aa8 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +[ -f Makefile ] || (echo "Error: must be run from the root of this repo" \ + && exit 1) + +set -e +SSH_KEY=$1 + +MACHINE_NAME="ooniprobe" + +echo "Using SSH Key $SSH_KEY" + +(docker-machine status $MACHINE_NAME 2>&1 | grep -q "Host does not exist") && \ + docker-machine create --driver generic \ + --generic-ip-address=$DEPLOY_HOST \ + --generic-ssh-key $SSH_KEY \ + $MACHINE_NAME + +# Print out the IP of this machine +docker-machine ip $MACHINE_NAME + +# Regenerate certs if there are errors with them +(docker-machine env $MACHINE_NAME) || docker-machine regenerate-certs $MACHINE_NAME + +eval "$(docker-machine env ${MACHINE_NAME})" +make docker-run-d +eval $(docker-machine env -u) diff --git a/secrets/secrets.tar.enc b/secrets/secrets.tar.enc new file mode 100644 index 0000000..7746f1a Binary files /dev/null and b/secrets/secrets.tar.enc differ

1 0

[ooni-probe/master] Feature/show logs (#691)
by art＠torproject.org 13 Jan '17

13 Jan '17

commit acad7172bc5112bac4ba6dbcc1db5f79338914b0 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 30 19:52:00 2016 +0000 Feature/show logs (#691) * Add support for obtaining logs from the web interface --- ooni/ui/web/server.py | 19 +++++++++++++++++++ ooni/utils/log.py | 2 ++ 2 files changed, 21 insertions(+) diff --git a/ooni/ui/web/server.py b/ooni/ui/web/server.py index 40c03e2..188612f 100644 --- a/ooni/ui/web/server.py +++ b/ooni/ui/web/server.py @@ -7,6 +7,7 @@ import string import random from functools import wraps from random import SystemRandom +from glob import glob from twisted.internet import defer, task, reactor from twisted.python import usage @@ -605,6 +606,24 @@ class WebUIAPI(object): raise WebUIError(404, "Could not find measurement with this idx") return self.render_json(r, request) + @app.route('/api/logs', + methods=["GET"]) + @xsrf_protect(check=True) + @requires_true(attrs=['_is_initialized']) + def api_get_logs(self, request): + with open(log.oonilogger.log_filepath) as input_file: + log_data = input_file.read() + logs = { + 'latest': log_data, + 'older': [] + } + for log_filepath in glob(log.oonilogger.log_filepath + ".*"): + with open(log_filepath) as input_file: + log_data = input_file.read() + logs['older'].append(log_data) + logs['older'].reverse() + return self.render_json(logs, request) + @app.route('/client/', branch=True) @xsrf_protect(check=False) def static(self, request): diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 42eb9ed..251e160 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -164,6 +164,8 @@ class OONILogger(object): log_folder = config.running_path logfile = os.path.join(log_folder, "ooniprobe.log") + self.log_filepath = logfile + mkdir_p(log_folder) log_filename = os.path.basename(logfile)

1 0