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

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 01 Feb '17

01 Feb '17

commit a82f94072a4ff293da72484b5a8cd17e146d8c82 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 1 21:18:05 2017 +0000 Update translations for tails-greeter-2 --- nl/nl.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 62f5294..45be8b6 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Wim <wikkesjr(a)gmail.com>, 2017\n" +"Last-Translator: kwadronaut <kwadronaut(a)autistici.org>, 2017\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,18 +79,22 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" +"MAC adres spoofing verbergt het serienummer van je netwerkkaart (wifi of " +"kabel) op lokale netwerken. Spoofing MAC adressen is meestal veiliger want " +"het helpt in het verbergen van je geografische locatie. Maar het kan ook " +"verbindingsproblemen met zich meebrengen of er verdacht uitzien." #: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Alle MAC adressen spoofen (standaard)" #: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "MAC adressen niet spoofen" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Kan versleutelde opslag niet ontgrendelen met deze wachtzin." #: ../data/greeter.ui.h:18 msgid "" @@ -143,15 +147,15 @@ msgstr "Tijdzone" #: ../data/greeter.ui.h:29 msgid "Encrypted Persistent Storage" -msgstr "" +msgstr "Versleutelde persistente opslag" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Toon wachtzin" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Versleutelde persistente opslag configureren" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" @@ -160,7 +164,7 @@ msgstr "" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 #: ../tailsgreeter/gui.py:510 msgid "Unlock" -msgstr "maak los" +msgstr "Ontgrendel" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" @@ -243,7 +247,7 @@ msgstr "" #: ../tailsgreeter/gui.py:481 msgid "Unlocking…" -msgstr "maak los" +msgstr "Ontgrendelen…" #: ../tailsgreeter/gui.py:562 msgid "Cancel" @@ -267,7 +271,7 @@ msgstr "Start Tails" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "" +msgstr "Standaard: links naar rechts" #: ../tailsgreeter/persistence.py:89 #, python-brace-format

1 0

[tor/master] prop271: When we exhaust all guards, mark all of them for retry.
by nickm＠torproject.org 01 Feb '17

01 Feb '17

commit 2938fd3b859a71b9f484623b8dae61e8e7a7f7ec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 17 12:59:41 2017 +0200 prop271: When we exhaust all guards, mark all of them for retry. In the past, when we exhausted all guards in our sampled set, we just waited there till we mark a guard for retry again (usually takes 10 mins for a primary guard, 1 hour for a non-primary guard). This patch marks all guards as maybe-reachable when we exhaust all guards (this can happen when network is down for some time). --- changes/bug21052 | 4 ++++ src/or/entrynodes.c | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/changes/bug21052 b/changes/bug21052 new file mode 100644 index 0000000..0597b3b --- /dev/null +++ b/changes/bug21052 @@ -0,0 +1,4 @@ + o Minor bugfixes (client, guards): + - Fix a bug of the new guard algorithm where tor could stall for up to 10 + minutes before retrying a guard after a long period of no network. + Fixes bug 21052; bugfix on 0.3.0.1-alpha. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ca3e57b..2b70230 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1900,7 +1900,9 @@ select_entry_guard_for_circuit(guard_selection_t *gs, SAMPLE_EXCLUDE_PRIMARY | SAMPLE_EXCLUDE_PENDING); if (guard == NULL) { - log_info(LD_GUARD, "Absolutely no sampled guards were available."); + log_info(LD_GUARD, "Absolutely no sampled guards were available. " + "Marking all guards for retry and starting from top again."); + mark_all_guards_maybe_reachable(gs); return NULL; } guard->is_pending = 1; @@ -1937,6 +1939,21 @@ entry_guards_note_guard_failure(guard_selection_t *gs, entry_guard_describe(guard)); } +/* Mark guard as maybe reachable again. */ +static void +mark_guard_maybe_reachable(entry_guard_t *guard) +{ + if (guard->is_reachable != GUARD_REACHABLE_NO) { + return; + } + + /* Note that we do not clear failing_since: this guard is now only + * _maybe-reachable_. */ + guard->is_reachable = GUARD_REACHABLE_MAYBE; + if (guard->is_filtered_guard) + guard->is_usable_filtered_guard = 1; +} + /** * Called when the network comes up after having seemed to be down for * a while: Mark the primary guards as maybe-reachable so that we'll @@ -1945,19 +1962,25 @@ entry_guards_note_guard_failure(guard_selection_t *gs, STATIC void mark_primary_guards_maybe_reachable(guard_selection_t *gs) { + tor_assert(gs); + if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { - if (guard->is_reachable != GUARD_REACHABLE_NO) - continue; + mark_guard_maybe_reachable(guard); + } SMARTLIST_FOREACH_END(guard); +} - /* Note that we do not clear failing_since: this guard is now only - * _maybe-reachable_. */ - guard->is_reachable = GUARD_REACHABLE_MAYBE; - if (guard->is_filtered_guard) - guard->is_usable_filtered_guard = 1; +/* Called when we exhaust all guards in our sampled set: Marks all guards as + * maybe-reachable so that we 'll try them again. */ +static void +mark_all_guards_maybe_reachable(guard_selection_t *gs) +{ + tor_assert(gs); + SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + mark_guard_maybe_reachable(guard); } SMARTLIST_FOREACH_END(guard); }

1 0

[tor/master] prop271: Move new funcs to top, to avoid compiler warnings.
by nickm＠torproject.org 01 Feb '17

01 Feb '17

commit def7115fe4cab45b4e3edc8fa3d8e063f04675d3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 17 13:04:45 2017 +0200 prop271: Move new funcs to top, to avoid compiler warnings. --- src/or/entrynodes.c | 91 +++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 2b70230..e26f32d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -570,6 +570,52 @@ get_extreme_restriction_threshold(void) 1, INT32_MAX); return pct / 100.0; } + +/* Mark guard as maybe reachable again. */ +static void +mark_guard_maybe_reachable(entry_guard_t *guard) +{ + if (guard->is_reachable != GUARD_REACHABLE_NO) { + return; + } + + /* Note that we do not clear failing_since: this guard is now only + * _maybe-reachable_. */ + guard->is_reachable = GUARD_REACHABLE_MAYBE; + if (guard->is_filtered_guard) + guard->is_usable_filtered_guard = 1; +} + +/** + * Called when the network comes up after having seemed to be down for + * a while: Mark the primary guards as maybe-reachable so that we'll + * try them again. + */ +STATIC void +mark_primary_guards_maybe_reachable(guard_selection_t *gs) +{ + tor_assert(gs); + + if (!gs->primary_guards_up_to_date) + entry_guards_update_primary(gs); + + SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { + mark_guard_maybe_reachable(guard); + } SMARTLIST_FOREACH_END(guard); +} + +/* Called when we exhaust all guards in our sampled set: Marks all guards as + maybe-reachable so that we 'll try them again. */ +static void +mark_all_guards_maybe_reachable(guard_selection_t *gs) +{ + tor_assert(gs); + + SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + mark_guard_maybe_reachable(guard); + } SMARTLIST_FOREACH_END(guard); +} + /**@}*/ /** @@ -1939,51 +1985,6 @@ entry_guards_note_guard_failure(guard_selection_t *gs, entry_guard_describe(guard)); } -/* Mark guard as maybe reachable again. */ -static void -mark_guard_maybe_reachable(entry_guard_t *guard) -{ - if (guard->is_reachable != GUARD_REACHABLE_NO) { - return; - } - - /* Note that we do not clear failing_since: this guard is now only - * _maybe-reachable_. */ - guard->is_reachable = GUARD_REACHABLE_MAYBE; - if (guard->is_filtered_guard) - guard->is_usable_filtered_guard = 1; -} - -/** - * Called when the network comes up after having seemed to be down for - * a while: Mark the primary guards as maybe-reachable so that we'll - * try them again. - */ -STATIC void -mark_primary_guards_maybe_reachable(guard_selection_t *gs) -{ - tor_assert(gs); - - if (!gs->primary_guards_up_to_date) - entry_guards_update_primary(gs); - - SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { - mark_guard_maybe_reachable(guard); - } SMARTLIST_FOREACH_END(guard); -} - -/* Called when we exhaust all guards in our sampled set: Marks all guards as - * maybe-reachable so that we 'll try them again. */ -static void -mark_all_guards_maybe_reachable(guard_selection_t *gs) -{ - tor_assert(gs); - - SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { - mark_guard_maybe_reachable(guard); - } SMARTLIST_FOREACH_END(guard); -} - /** * Note that we successfully connected to, and built a circuit through * guard. Given the old guard-state of the circuit in old_state,

1 0

[tor/master] Merge remote-tracking branch 'asn/bug21052'
by nickm＠torproject.org 01 Feb '17

01 Feb '17

commit 2d2ab29ce89d85f64f4bf4802d6b1e22a74a9ad9 Merge: 77788fa def7115 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 1 15:53:16 2017 -0500 Merge remote-tracking branch 'asn/bug21052' changes/bug21052 | 4 +++ src/or/entrynodes.c | 74 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 25 deletions(-) diff --cc src/or/entrynodes.c index e341739,e26f32d..b7c05f1 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@@ -1851,10 -1944,11 +1897,12 @@@ select_entry_guard_for_circuit(guard_se rst, SAMPLE_EXCLUDE_CONFIRMED | SAMPLE_EXCLUDE_PRIMARY | - SAMPLE_EXCLUDE_PENDING); + SAMPLE_EXCLUDE_PENDING | + flags); if (guard == NULL) { - log_info(LD_GUARD, "Absolutely no sampled guards were available."); + log_info(LD_GUARD, "Absolutely no sampled guards were available. " + "Marking all guards for retry and starting from top again."); + mark_all_guards_maybe_reachable(gs); return NULL; } guard->is_pending = 1;

1 0

[torbutton/maint-1.9.6] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 2a311617e1045cf5316fdab9aea1df9b1c7d02d4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[torbutton/master] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 9c4a20bec5d1f3fc38a103b4f47c1039f48119dd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[tor-messenger-build/master] Bump tag on comm-esr45 to THUNDERBIRD_45_7_0_RELEASE
by arlo＠torproject.org 01 Feb '17

01 Feb '17

commit be112c3ebcb263f55fb6236ed8fe2b95abb22277 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 1 09:10:36 2017 -0800 Bump tag on comm-esr45 to THUNDERBIRD_45_7_0_RELEASE * Should have been part of 1eb04e3a9 --- projects/instantbird/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 13859d7..1f3ecae 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ -hg_hash: THUNDERBIRD_45_6_0_RELEASE +hg_hash: THUNDERBIRD_45_7_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" remote_docker: 1 var:

1 0

[stem/master] Fix unit tests
by atagar＠torproject.org 01 Feb '17

01 Feb '17

commit c138aa193350012ea97a6e7397fdd74661946981 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 1 09:09:04 2017 -0800 Fix unit tests Huh. Not sure why these didn't come up on my netbook. Moving resources broke three of our tests. --- test/unit/descriptor/extrainfo_descriptor.py | 2 +- test/unit/descriptor/networkstatus/document_v3.py | 2 +- test/unit/descriptor/router_status_entry.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index ce898d3..8dc4130 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -171,7 +171,7 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw Malformed descriptor with non-ascii content for the 'dirreq-v3-reqs' line. """ - with open(get_resource('extrainfo_nonascii_v3_reqs'), 'rb') as descriptor_file: + with open(get_resource('unparseable/extrainfo_nonascii_v3_reqs'), 'rb') as descriptor_file: try: next(stem.descriptor.parse_file(descriptor_file, 'extra-info 1.0', validate = True)) self.fail("validation should've raised an exception") diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index f34bcc8..a3da8a4 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -240,7 +240,7 @@ JZ/1HL9sHyZfo6bwaC6YSM9PNiiY6L7rnGpS7UkHiFI+M96VCMorvjm5YPs3FioJ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= -----END SIGNATURE-----""" - with open(get_resource('vote'), 'rb') as descriptor_file: + with open(get_resource('unparseable/vote'), 'rb') as descriptor_file: document = stem.descriptor.networkstatus.NetworkStatusDocumentV3(descriptor_file.read(), default_params = False) self.assertEqual(3, document.version) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index fc02539..43bcaee 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -629,7 +629,7 @@ class TestRouterStatusEntry(unittest.TestCase): Read a descriptor file with windows newlines (CRLF). """ - descriptor_path = get_resource('cached-microdesc-consensus_with_carriage_returns') + descriptor_path = get_resource('unparseable/cached-microdesc-consensus_with_carriage_returns') with open(descriptor_path, 'rb') as descriptor_file: descriptors = stem.descriptor.parse_file(descriptor_file, 'network-status-microdesc-consensus-3 1.0', normalize_newlines = True)

1 0

[metrics-lib/master] Make the reader thread a daemon thread.
by karsten＠torproject.org 01 Feb '17

01 Feb '17

commit 74ee2145eedacb61b14e9c234b8f4266710e5eb9 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Oct 25 12:33:24 2016 +0200 Make the reader thread a daemon thread. --- CHANGELOG.md | 4 ++++ .../java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afaa1e8..755428d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ process. - Avoid deleting extraneous local descriptor files when collecting descriptors from CollecTor. + - Turn the descriptor reader thread into a daemon thread, so that + the application can decide at any time to stop consuming + descriptors without having to worry about the reader thread not + being done. # Changes in version 1.5.0 - 2016-10-19 diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index cb14588..12d73ad 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -153,7 +153,9 @@ public class DescriptorReaderImpl implements DescriptorReader { this.tarballs, descriptorQueue, this.autoSaveHistoryFile, this.manualSaveHistoryFile, this.excludedFiles, this.failUnrecognizedDescriptorLines); - new Thread(this.reader).start(); + Thread readerThread = new Thread(this.reader); + readerThread.setDaemon(true); + readerThread.start(); return descriptorQueue; }

1 0

[stem/master] Update copyright dates for 2017
by atagar＠torproject.org 01 Feb '17

01 Feb '17

commit 8ef8798d30d3fccca1ae7690ade29b41c5f1d6cc Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 30 10:41:47 2017 -0800 Update copyright dates for 2017 Bumping the dates for 2017... % find stem -type f -iname '*.py' -exec sed -i 's/2016/2017/g' "{}" +; --- cache_fallback_directories.py | 2 +- cache_manual.py | 2 +- run_tests.py | 2 +- stem/__init__.py | 2 +- stem/connection.py | 2 +- stem/control.py | 2 +- stem/descriptor/__init__.py | 2 +- stem/descriptor/export.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/hidden_service_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/reader.py | 2 +- stem/descriptor/remote.py | 2 +- stem/descriptor/router_status_entry.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/descriptor/tordnsel.py | 2 +- stem/exit_policy.py | 2 +- stem/interpreter/__init__.py | 2 +- stem/interpreter/arguments.py | 2 +- stem/interpreter/autocomplete.py | 2 +- stem/interpreter/commands.py | 2 +- stem/interpreter/help.py | 2 +- stem/manual.py | 2 +- stem/prereq.py | 2 +- stem/process.py | 2 +- stem/response/__init__.py | 2 +- stem/response/add_onion.py | 2 +- stem/response/authchallenge.py | 2 +- stem/response/events.py | 2 +- stem/response/getconf.py | 2 +- stem/response/getinfo.py | 2 +- stem/response/mapaddress.py | 2 +- stem/response/protocolinfo.py | 2 +- stem/socket.py | 2 +- stem/util/__init__.py | 2 +- stem/util/conf.py | 2 +- stem/util/connection.py | 2 +- stem/util/enum.py | 2 +- stem/util/log.py | 2 +- stem/util/proc.py | 2 +- stem/util/str_tools.py | 2 +- stem/util/system.py | 2 +- stem/util/term.py | 2 +- stem/util/test_tools.py | 2 +- stem/util/tor_tools.py | 2 +- stem/version.py | 2 +- test/__init__.py | 2 +- test/arguments.py | 2 +- test/mocking.py | 2 +- test/network.py | 2 +- test/output.py | 2 +- test/runner.py | 2 +- test/util.py | 2 +- tor-prompt | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py index 79f21eb..4d5665b 100755 --- a/cache_fallback_directories.py +++ b/cache_fallback_directories.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2016-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/cache_manual.py b/cache_manual.py index 19e73f0..7a4bd5c 100755 --- a/cache_manual.py +++ b/cache_manual.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/run_tests.py b/run_tests.py index ca6be67..abb5123 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/__init__.py b/stem/__init__.py index de2ce9d..e9e621c 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/connection.py b/stem/connection.py index 1f023a4..967b766 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/control.py b/stem/control.py index 5040778..61d54fb 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index ee0b289..c16106d 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index d8222a0..945c428 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index e366bee..716b75c 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index 43a3e4f..97cd19e 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 0f1a015..ce3eb08 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2016, Damian Johnson and The Tor Project +# Copyright 2013-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 78b453b..cb801f0 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index acfce67..b4e6ab4 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 4283616..a66672c 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -1,4 +1,4 @@ -# Copyright 2013-2016, Damian Johnson and The Tor Project +# Copyright 2013-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 98fc042..880051b 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 0ba28b3..ca6a16b 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index cd85e8e..731dbfa 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -1,4 +1,4 @@ -# Copyright 2013-2016, Damian Johnson and The Tor Project +# Copyright 2013-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 2e2b459..aaf10b0 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index f516565..237a781 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index 2bb1783..010aa3f 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/autocomplete.py b/stem/interpreter/autocomplete.py index ac67609..1c483cc 100644 --- a/stem/interpreter/autocomplete.py +++ b/stem/interpreter/autocomplete.py @@ -1,4 +1,4 @@ -# Copyright 2014-2016, Damian Johnson and The Tor Project +# Copyright 2014-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index e348c6e..366f256 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -1,4 +1,4 @@ -# Copyright 2014-2016, Damian Johnson and The Tor Project +# Copyright 2014-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/help.py b/stem/interpreter/help.py index 5c7fa06..6fb0917 100644 --- a/stem/interpreter/help.py +++ b/stem/interpreter/help.py @@ -1,4 +1,4 @@ -# Copyright 2014-2016, Damian Johnson and The Tor Project +# Copyright 2014-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/manual.py b/stem/manual.py index 70cae73..f5970ce 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/prereq.py b/stem/prereq.py index 8dafd85..4574771 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/process.py b/stem/process.py index 08e0426..ec10b21 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 3300d41..8d1eaf8 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/response/add_onion.py b/stem/response/add_onion.py index cbf7594..88de780 100644 --- a/stem/response/add_onion.py +++ b/stem/response/add_onion.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import stem.response diff --git a/stem/response/authchallenge.py b/stem/response/authchallenge.py index 3295d14..d77fd81 100644 --- a/stem/response/authchallenge.py +++ b/stem/response/authchallenge.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import binascii diff --git a/stem/response/events.py b/stem/response/events.py index 91aaecd..320e6e9 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import io diff --git a/stem/response/getconf.py b/stem/response/getconf.py index 9d786fc..2bbc6d4 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import stem.response diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index 4dad540..0d3a0f0 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import stem.response diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py index 76334f8..7535e92 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import stem.response diff --git a/stem/response/protocolinfo.py b/stem/response/protocolinfo.py index 6abdf47..6243b4d 100644 --- a/stem/response/protocolinfo.py +++ b/stem/response/protocolinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import stem.response diff --git a/stem/socket.py b/stem/socket.py index 4537ea6..011f35e 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/__init__.py b/stem/util/__init__.py index de3c0ea..5ee5d5f 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/conf.py b/stem/util/conf.py index dff5ace..5691b2a 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/connection.py b/stem/util/connection.py index a375a17..ba45c8d 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/enum.py b/stem/util/enum.py index e6b62c8..958a80e 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/log.py b/stem/util/log.py index fcf80ea..adcdc41 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/proc.py b/stem/util/proc.py index 0a310bf..ad24bc8 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 6d59303..0fbdf38 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/system.py b/stem/util/system.py index 600ab49..c1db6d0 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/term.py b/stem/util/term.py index 1940b9e..895c4e9 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 21adc9a..3b11713 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 7062c77..424797b 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/version.py b/stem/version.py index 22a67b6..37232c3 100644 --- a/stem/version.py +++ b/stem/version.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/__init__.py b/test/__init__.py index 205dfa0..7ab0853 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/arguments.py b/test/arguments.py index fb01f4d..4ecd3bb 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Damian Johnson and The Tor Project +# Copyright 2015-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/mocking.py b/test/mocking.py index cb576d8..0d9e6f0 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/network.py b/test/network.py index 1156c5c..7a04efd 100644 --- a/test/network.py +++ b/test/network.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/output.py b/test/output.py index c9a2116..82eb358 100644 --- a/test/output.py +++ b/test/output.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/runner.py b/test/runner.py index fa65a72..ff1da66 100644 --- a/test/runner.py +++ b/test/runner.py @@ -1,4 +1,4 @@ -# Copyright 2011-2016, Damian Johnson and The Tor Project +# Copyright 2011-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/util.py b/test/util.py index d62a080..482677e 100644 --- a/test/util.py +++ b/test/util.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016, Damian Johnson and The Tor Project +# Copyright 2012-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/tor-prompt b/tor-prompt index bf2c00a..1919ddc 100755 --- a/tor-prompt +++ b/tor-prompt @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2014-2016, Damian Johnson and The Tor Project +# Copyright 2014-2017, Damian Johnson and The Tor Project # See LICENSE for licensing information import stem.interpreter

1 0