[tor-commits] [stem/master] Tagging version 1.1 changelog

[atagar at torproject.org]

commit a5392292c829190940d43c34690b0d08e6eaaf1c
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Oct 13 18:37:04 2013 -0700

    Tagging version 1.1 changelog
    
    Revising our changelog to list the changes in version 1.1. Also re-adding the
    '-dev' suffix to our git version.
---
 docs/change_log.rst |    5 +++++
 stem/__init__.py    |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 334f995..62c9ea3 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -38,6 +38,11 @@ Unreleased
 The following are only available within stem's `git repository
 <download.html>`_.
 
+.. _version_1.1:
+
+Version 1.1
+-----------
+
  * **Controller**
 
   * :func:`~stem.control.Controller.get_network_status` and :func:`~stem.control.Controller.get_network_statuses` now provide v3 rather than v2 directory information (:trac:`7953`, :spec:`d2b7ebb`)
diff --git a/stem/__init__.py b/stem/__init__.py
index 5abe6a7..e87bd9f 100644
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@ -368,7 +368,7 @@ Library for working with the tor process.
   =============== ===========
 """
 
-__version__ = '1.1.0'
+__version__ = '1.1.0-dev'
 __author__ = 'Damian Johnson'
 __contact__ = 'atagar at torproject.org'
 __url__ = 'https://stem.torproject.org/'