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

[atagar at torproject.org]

commit c27dc313c0ead935bbc71e8b92938fe4a4b18168
Merge: e8c916b b1fb3e7
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Nov 9 11:46:25 2013 -0800

    Merge version 1.1.1 hotfix

 stem/__init__.py    |    2 +-
 stem/util/system.py |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc stem/__init__.py
index 9710d24,1d47783..0415152
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@@ -366,35 -366,9 +366,35 @@@ Library for working with the tor proces
    **DISCARD**     throwing out timeout value from when the network was down
    **RESUME**      resumed calculations to determine the proper timeout
    =============== ===========
 +
 +.. data:: ConnectionType (enum)
 +
 +  Purpose for a tor connection. Tor may provide types not in this enum.
 +
 +  The meaning behind these values is a bit unclear, pending :trac:`10086`.
 +
 +  =============== ===========
 +  ConnectionType  Description
 +  =============== ===========
 +  **OR**          carrying traffic within the tor network
 +  **DIR**         fetching or sending tor descriptor data
 +  **EXIT**        carrying traffic between the tor network and an external destination
 +  =============== ===========
 +
 +.. data:: TokenBucket (enum)
 +
 +  Bucket categories of TB_EMPTY events.
 +
 +  =============== ===========
 +  TokenBucket     Description
 +  =============== ===========
 +  **GLOBAL**      global token bucket
 +  **RELAY**       relay token bucket
 +  **ORCONN**      bucket used for OR connections
 +  =============== ===========
  """
  
- __version__ = '1.1.0-dev'
 -__version__ = '1.1.1'
++__version__ = '1.1.1-dev'
  __author__ = 'Damian Johnson'
  __contact__ = 'atagar at torproject.org'
  __url__ = 'https://stem.torproject.org/'