[tor-commits] [stem/master] Stem release 1.2.0

[atagar at torproject.org]

commit 59408c3f1f6c785d12c543859a1e0abf308abfa1
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Jun 1 12:55:28 2014 -0700

    Stem release 1.2.0
---
 docs/index.rst   |    2 +-
 stem/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 40e2ebd..1925920 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Welcome to Stem!
 ================
 
-Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.1.1** (released November 9th, 2013).
+Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.0** (released June 1st, 2014).
 
 .. Main Stem Logo
    Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html
diff --git a/stem/__init__.py b/stem/__init__.py
index f32a3bd..c61b982 100644
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@ -421,7 +421,7 @@ Library for working with the tor process.
   ================= ===========
 """
 
-__version__ = '1.1.1-dev'
+__version__ = '1.2.0'
 __author__ = 'Damian Johnson'
 __contact__ = 'atagar at torproject.org'
 __url__ = 'https://stem.torproject.org/'