commit be359f9b3ef27882d2977a0f0a16e9fb150a3bf8 Merge: 4bd8e05 946a321 Author: Isis Lovecruft isis@torproject.org Date: Mon Mar 11 19:18:55 2013 +0000

Merge branch 'master' into develop

requirements.txt | 5 +--- setup.py | 55 ++++++++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 32 deletions(-)