commit 3513f45d2996154465085b74555cddc885c9279f Merge: 51e9ff3 b5d31dc Author: Arturo Filastò art@fuffa.org Date: Wed Dec 26 17:34:18 2012 +0100

Merge branch 'txsocksx'

* txsocksx: Add txsocksx as a dependency Properly handle closure of filedescriptors in runner.py More detailed error handling for SOCKS Use txsocksx as a SOCKS proxy Minor refactoring of txagentwithsocks

README.md | 1 + ooni/nettest.py | 60 ++++++++++++++++--- ooni/runner.py | 6 +- ooni/templates/httpt.py | 2 +- ooni/utils/txagentwithsocks.py | 127 ++-------------------------------------- requirements.txt | 1 + 6 files changed, 65 insertions(+), 132 deletions(-)