[tor-commits] [stem/master] Merge version 1.4.1 hotfix

[atagar at torproject.org]

commit 9c0268a007c48b7ac4ad4c14950c3d976340f67c
Merge: 1ee755f 3884d37
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon May 18 12:24:10 2015 -0700

    Merge version 1.4.1 hotfix

 docs/change_log.rst                       |    4 +++
 docs/download.rst                         |    4 +--
 docs/index.rst                            |    2 +-
 stem/__init__.py                          |    2 +-
 stem/descriptor/__init__.py               |    6 ++++
 stem/descriptor/router_status_entry.py    |   18 ++++++++---
 test/unit/descriptor/server_descriptor.py |   48 +++++++++++++++++++----------
 7 files changed, 60 insertions(+), 24 deletions(-)

diff --cc stem/__init__.py
index 7229453,9ff1263..ead8224
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@@ -441,7 -441,7 +441,7 @@@ Library for working with the tor proces
    ================= ===========
  """
  
- __version__ = '1.4.0-dev'
 -__version__ = '1.4.1'
++__version__ = '1.4.1-dev'
  __author__ = 'Damian Johnson'
  __contact__ = 'atagar at torproject.org'
  __url__ = 'https://stem.torproject.org/'