commit 5ca95ace243f8baa1f2f3203c1be605ae82686a0 Merge: 4bd8e05 b96b8a6 Author: Isis Agora Lovecruft <isis@torproject.org> Date: Mon Mar 11 12:04:02 2013 -0700 Merge pull request #56 from hellais/feature/setup.py Feature/setup.py requirements.txt | 5 +--- setup.py | 55 ++++++++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 32 deletions(-)