commit a91776a1e9ba546984698d02f219d82157e086c1 Merge: d81dafb ca0ea05 Author: Damian Johnson atagar@torproject.org Date: Sat Jun 7 11:41:51 2014 -0700

Merge version 1.2.2 hotfix

docs/index.rst | 2 +- stem/__init__.py | 2 +- stem/util/conf.py | 9 +++++++-- test/integ/descriptor/server_descriptor.py | 14 +++++++++----- 4 files changed, 18 insertions(+), 9 deletions(-)

diff --cc stem/__init__.py index 9362e7b,46942aa..6b15abd --- a/stem/__init__.py +++ b/stem/__init__.py @@@ -421,7 -421,7 +421,7 @@@ Library for working with the tor proces ================= =========== """

- __version__ = '1.2.1-dev' -__version__ = '1.2.2' ++__version__ = '1.2.2-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar@torproject.org' __url__ = 'https://stem.torproject.org/'