[tor-commits] [oonib/master] Merge branch 'develop'

[isis at torproject.org]

commit 4efed91ea4fd5bf4b0eab6564188b57b9393cbd3
Merge: 03dc532 7ab522e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 15 22:41:36 2013 +0000

    Merge branch 'develop'
    
     * Add comments explaining dependencies in requirements.txt.
     * Add specific required version to pysqlite dependency.

 requirements.txt |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)