commit ff36ce755731a53edb0ff6644eb5606b0344bf7b
Merge: c29f21c c2541bd
Author: Damian Johnson <[email protected]>
Date: Tue Jun 3 08:18:58 2014 -0700
Merge version 1.2.1 hotfix
docs/index.rst | 2 +-
stem/__init__.py | 2 +-
stem/descriptor/extrainfo_descriptor.py | 2 +-
stem/descriptor/microdescriptor.py | 2 +-
stem/descriptor/networkstatus.py | 2 +-
stem/descriptor/server_descriptor.py | 2 +-
stem/interpreter/commands.py | 3 ++-
7 files changed, 8 insertions(+), 7 deletions(-)
diff --cc stem/__init__.py
index 5418059,1ec50ab..9362e7b
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@@ -421,7 -421,7 +421,7 @@@ Library for working with the tor proces
================= ===========
"""
- __version__ = '1.2.0-dev'
-__version__ = '1.2.1'
++__version__ = '1.2.1-dev'
__author__ = 'Damian Johnson'
__contact__ = '[email protected]'
__url__ = 'https://stem.torproject.org/'
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
