commit 01a0647577ec4eacdaf917d6e0800fb6f6a17ea3 Merge: 8d9e5b6 e7a9bcf Author: aagbsn aagbsn@extc.org Date: Thu Nov 28 07:28:54 2013 -0800

Merge pull request #250 from TheTorProject/feature/list-tests

Feature/list tests

ooni/director.py | 1 + ooni/nettest.py | 2 +- ooni/nettests/blocking/tcp_connect.py | 69 +++++++++++++++++++++++++++ ooni/nettests/blocking/tcpconnect.py | 69 --------------------------- ooni/nettests/manipulation/captiveportal.py | 2 +- ooni/oonicli.py | 17 +++++-- 6 files changed, 86 insertions(+), 74 deletions(-)