commit 6157aff26251fb6bcc09e85f10ca39db01cf3e79 Merge: f4b45f9 98ab8e8 Author: Isis Lovecruft isis@torproject.org Date: Wed Oct 31 18:53:58 2012 +0000
Merge branch 'rebase2-after'
nettests/core/captiveportal.py | 3 +- ooni/echo.py | 206 ++++++++++++++++++++++++++++++++++ ooni/inputunit.py | 132 +++++++++++++++++++++- ooni/nettest.py | 90 ++++++++++----- ooni/oonicli.py | 1 - ooni/reporter.py | 1 + ooni/runner.py | 77 +++++++++++-- ooni/templates/scapyt.py | 9 +- ooni/utils/assertions.py | 180 ++++++++++++++++++++++++++++++ ooni/utils/hacks.py | 32 ++++++ ooni/utils/meta.py | 241 ++++++++++++++++++++++++++++++++++++++++ ooni/utils/net.py | 25 ++++ ooni/utils/process.py | 25 ++++- tests/test-class-design.py | 101 +++++++++++++++++ 14 files changed, 1069 insertions(+), 54 deletions(-)