tor-commits

tor-commits@lists.torproject.org

January 2019

15 participants
2082 discussions

[stem/master] Update copyright dates for 2019
by atagar＠torproject.org 01 Jan '19

01 Jan '19

commit 0724fa5273413d3c4ed275cfa52601ab07f34518 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 31 16:22:20 2018 -0800 Update copyright dates for 2019 Happy new year! Bumping the dates for 2019... % find . -type f -iname '*.py' -exec sed -i 's/-2018/-2019/g' "{}" +; % grep -R "# Copyright 2018," ./* --- cache_fallback_directories.py | 2 +- cache_manual.py | 2 +- run_tests.py | 2 +- setup.py | 2 +- stem/__init__.py | 2 +- stem/client/__init__.py | 2 +- stem/client/cell.py | 2 +- stem/client/datatype.py | 2 +- stem/connection.py | 2 +- stem/control.py | 2 +- stem/descriptor/__init__.py | 2 +- stem/descriptor/certificate.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/directory.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/network.py | 2 +- test/output.py | 2 +- test/require.py | 2 +- test/runner.py | 2 +- test/task.py | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py index 086b8c76..3a6b54c9 100755 --- a/cache_fallback_directories.py +++ b/cache_fallback_directories.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016-2018, Damian Johnson and The Tor Project +# Copyright 2016-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/cache_manual.py b/cache_manual.py index 30e202bb..4c32725c 100755 --- a/cache_manual.py +++ b/cache_manual.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/run_tests.py b/run_tests.py index 7fb0a9f9..e8dd1a82 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/setup.py b/setup.py index 367c81a2..0375e94f 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information # # Release Checklist diff --git a/stem/__init__.py b/stem/__init__.py index 019be855..1d3436f1 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/client/__init__.py b/stem/client/__init__.py index c0d060ba..3fb68a69 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2018, Damian Johnson and The Tor Project +# Copyright 2018-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/client/cell.py b/stem/client/cell.py index 91dec143..7aae7fbb 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -1,4 +1,4 @@ -# Copyright 2018, Damian Johnson and The Tor Project +# Copyright 2018-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/client/datatype.py b/stem/client/datatype.py index de67fcdc..59a0c167 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -1,4 +1,4 @@ -# Copyright 2018, Damian Johnson and The Tor Project +# Copyright 2018-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/connection.py b/stem/connection.py index 16882c70..2283dc58 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/control.py b/stem/control.py index 6d926ff0..ce2d79a4 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 5f153f81..a47c1508 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 0c4796af..37829bc4 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -1,4 +1,4 @@ -# Copyright 2017-2018, Damian Johnson and The Tor Project +# Copyright 2017-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index c565bfac..e7b465bf 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 ea74ea52..7f13e32c 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 ad68c349..b5bcc2fc 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 78b2b532..4703c914 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2018, Damian Johnson and The Tor Project +# Copyright 2013-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 45054b6b..dd43d5c2 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index ca087ec6..32ec39fa 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 8a2877fa..20622cce 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -1,4 +1,4 @@ -# Copyright 2013-2018, Damian Johnson and The Tor Project +# Copyright 2013-2019, 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 45385135..321b1004 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 98300775..70f31867 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index c4aba296..a40467b4 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -1,4 +1,4 @@ -# Copyright 2013-2018, Damian Johnson and The Tor Project +# Copyright 2013-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/directory.py b/stem/directory.py index 1782fbf1..7239f9a0 100644 --- a/stem/directory.py +++ b/stem/directory.py @@ -1,4 +1,4 @@ -# Copyright 2018, Damian Johnson and The Tor Project +# Copyright 2018-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 0ed5e581..f02ec146 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 131ecd64..b10109e8 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index db0dd488..99c38795 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/autocomplete.py b/stem/interpreter/autocomplete.py index 6401e22c..a08a34fb 100644 --- a/stem/interpreter/autocomplete.py +++ b/stem/interpreter/autocomplete.py @@ -1,4 +1,4 @@ -# Copyright 2014-2018, Damian Johnson and The Tor Project +# Copyright 2014-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index a281c085..fe0e1341 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -1,4 +1,4 @@ -# Copyright 2014-2018, Damian Johnson and The Tor Project +# Copyright 2014-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/interpreter/help.py b/stem/interpreter/help.py index 20962c45..8b3b9964 100644 --- a/stem/interpreter/help.py +++ b/stem/interpreter/help.py @@ -1,4 +1,4 @@ -# Copyright 2014-2018, Damian Johnson and The Tor Project +# Copyright 2014-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/manual.py b/stem/manual.py index 7b956aa5..0aef8a48 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/prereq.py b/stem/prereq.py index ab2acba7..594e4239 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/process.py b/stem/process.py index e6aaf50b..522ee7bf 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 96436b4d..ea4d2331 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 60e77ae3..d60e0d24 100644 --- a/stem/response/add_onion.py +++ b/stem/response/add_onion.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, 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 43647982..6dd07b52 100644 --- a/stem/response/authchallenge.py +++ b/stem/response/authchallenge.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 64ed250d..da0b3f9d 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 0c62ba51..35501767 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 00c77b92..c7379a9b 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 417449b2..47647d35 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, 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 bf559310..7cb216ce 100644 --- a/stem/response/protocolinfo.py +++ b/stem/response/protocolinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information import sys diff --git a/stem/socket.py b/stem/socket.py index 3da24c29..2040b950 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/__init__.py b/stem/util/__init__.py index fba506eb..7fff7dbe 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/conf.py b/stem/util/conf.py index 999d8196..80399810 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/connection.py b/stem/util/connection.py index 4ac8b2ed..d9a23815 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/enum.py b/stem/util/enum.py index 00835ca5..9e9d2228 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/log.py b/stem/util/log.py index 0b2de90a..beaf8580 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/proc.py b/stem/util/proc.py index 7fcfd1b3..de357eff 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, 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 0f31fb22..aba619b9 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/system.py b/stem/util/system.py index 2d52b022..80e80f75 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/util/term.py b/stem/util/term.py index b4acd61f..e53c3350 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, 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 21e4a89b..4455c284 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, 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 b3db3712..301d7ea0 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/stem/version.py b/stem/version.py index 01a95249..38101694 100644 --- a/stem/version.py +++ b/stem/version.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/__init__.py b/test/__init__.py index 6ca66041..fa9678af 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/arguments.py b/test/arguments.py index accdf23e..87735182 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2015-2018, Damian Johnson and The Tor Project +# Copyright 2015-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/network.py b/test/network.py index 0278a8ad..f1b33676 100644 --- a/test/network.py +++ b/test/network.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/output.py b/test/output.py index 02e7cf4f..8ca64372 100644 --- a/test/output.py +++ b/test/output.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/require.py b/test/require.py index 25a7ae12..e6a0bbcc 100644 --- a/test/require.py +++ b/test/require.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/runner.py b/test/runner.py index 9c2438a2..b92b5a01 100644 --- a/test/runner.py +++ b/test/runner.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018, Damian Johnson and The Tor Project +# Copyright 2011-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/test/task.py b/test/task.py index a763e710..5614d65e 100644 --- a/test/task.py +++ b/test/task.py @@ -1,4 +1,4 @@ -# Copyright 2012-2018, Damian Johnson and The Tor Project +# Copyright 2012-2019, Damian Johnson and The Tor Project # See LICENSE for licensing information """

1 0

[stem/master] Better type checking for RELAY cell replies
by atagar＠torproject.org 01 Jan '19

01 Jan '19

commit d60ac492e2f2abb4f2c0764e28d77eb096365b17 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 14:58:55 2018 -0800 Better type checking for RELAY cell replies The message we give when RELAY cells receive an unexpected response are pretty bad... ProtocolError: Circuit response should be a series of RELAY cells, but received an unexpected size for a response: 4048 Instead checking the cell types, providing a more descriptive error if they mismatch. This doesn't fix the issue I'm trying to solve, but it gets me a bit closer to the true problem of ticket #28961... ProtocolError: RELAY cells should be 512 bytes, but received 464 --- stem/client/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 8e8bb118..c0d060ba 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -258,10 +258,12 @@ class Circuit(object): reply = self.relay._orport.recv() reply_cells = [] - if len(reply) % self.relay.link_protocol.fixed_cell_length != 0: - raise stem.ProtocolError('Circuit response should be a series of RELAY cells, but received an unexpected size for a response: %i' % len(reply)) - while reply: + reply_cmd = stem.client.datatype.Size.CHAR.pop(reply[self.relay.link_protocol.circ_id_size.size:])[0] + + if reply_cmd != stem.client.cell.RelayCell.VALUE: + raise stem.ProtocolError('Circuit response should be a series of RELAY cells, but received an unexpected %s (%i)' % (stem.client.cell.Cell.by_value(reply_cmd), reply_cmd)) + encrypted_cell, reply = split(reply, self.relay.link_protocol.fixed_cell_length) decrypted_cell, backward_key, backward_digest = stem.client.cell.RelayCell.decrypt(self.relay.link_protocol, encrypted_cell, self.backward_key, self.backward_digest)

1 0

Jump to page: