commit 65add2a35b45d6d12d29fa4cc2489208b1300f81 Merge: 50f154a 5390309 Author: Damian Johnson <atagar@torproject.org> Date: Tue Jan 3 10:33:08 2017 -0800 Merge version 1.5.4 hotfix docs/change_log.rst | 3 ++ docs/index.rst | 2 +- stem/__init__.py | 2 +- stem/descriptor/networkstatus.py | 47 ++--------------------- test/mocking.py | 14 +++---- test/unit/descriptor/networkstatus/document_v3.py | 29 +------------- 6 files changed, 16 insertions(+), 81 deletions(-) diff --cc stem/__init__.py index 1acf0f4,7a84f8c..d74e90b --- a/stem/__init__.py +++ b/stem/__init__.py @@@ -470,7 -470,7 +470,7 @@@ Library for working with the tor proces import stem.util.enum - __version__ = '1.5.3-dev' -__version__ = '1.5.4' ++__version__ = '1.5.4-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar@torproject.org' __url__ = 'https://stem.torproject.org/'