commit 1d93ef03802485da67848cbab918b1edc01669df Author: Arturo Filastò art@fuffa.org Date: Wed Feb 27 15:58:29 2013 +0100

Txscapy is now in pypi, no need to have it mirrored on tpo (cherry picked from commit e74ea0cbd7816bda547dced875523253ca6d312a)

Conflicts: requirements.txt --- requirements.txt | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt index 0583467..bdf4cd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ pyOpenSSL>=0.13 pygeoip>=0.2.5 transaction>=1.3.0 txtorcon>=0.7 +txsocksx>=0.0.2 zope.component>=4.0.0 zope.event>=4.0.0 zope.interface>=4.0.1 @@ -24,10 +25,6 @@ https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/Parsley-1.1pre1... # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy # Mirrored on Tor's webserver: https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-201... -# Originally fetched from github: -# https://github.com/hellais/txsocksx/archive/master.zip -# Mirrored on Tor's webserver: -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/hellais-txsocks... # This was 'dnspython>=1.10.0' above until it failed to download many times. # Originally fetched from dnspython but it timed out often: # http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.zip