commit 16835b07f9cc925fc0dd2e673b18d419d3ffdf98 Merge: 5c29daa e05f529 Author: Isis Lovecruft isis@torproject.org Date: Thu Nov 8 06:41:33 2012 +0000
Merge branch 'master' of git-rw.torproject.org:ooni-probe
before_i_commit.sh | 1 + nettests/bridge_reachability/bridget.py | 2 +- nettests/bridge_reachability/echo.py | 35 +---- nettests/core/dnstamper.py | 28 ++-- nettests/core/http_host.py | 11 +- nettests/examples/example_scapyt.py | 25 +--- ooni/nettest.py | 44 +++++- ooni/runner.py | 24 ++-- ooni/templates/scapyt.py | 103 +++++++------- ooni/utils/assertions.py | 180 ----------------------- ooni/utils/config.py | 121 ---------------- ooni/utils/meta.py | 241 ------------------------------- ooni/utils/onion.py | 17 ++- ooni/utils/process.py | 73 ---------- ooni/utils/timer.py | 107 -------------- wtf/README | 9 ++ wtf/assertions.py | 180 +++++++++++++++++++++++ wtf/config.py | 66 +++++++++ wtf/meta.py | 241 +++++++++++++++++++++++++++++++ wtf/process.py | 73 ++++++++++ wtf/timer.py | 107 ++++++++++++++ 21 files changed, 829 insertions(+), 859 deletions(-)