commit 84d8a5035b4986f40e5f3fed841b4e7cd734d1e0 Merge: c857786 f2522ef Author: Damian Johnson atagar@torproject.org Date: Tue Dec 6 09:34:21 2016 -0800

Merge version 1.5.3 hotfix

docs/change_log.rst | 3 ++ docs/index.rst | 2 +- setup.py | 83 +++++++++++++++++++++++++++++++++------------- stem/__init__.py | 2 +- test/integ/installation.py | 48 +++++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 25 deletions(-)

diff --cc stem/__init__.py index b02dd9c,66502c8..1acf0f4 --- 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.2-dev' -__version__ = '1.5.3' ++__version__ = '1.5.3-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar@torproject.org' __url__ = 'https://stem.torproject.org/'