commit 064be176e2b02b4ff4a15f48777e1b5b03f7e882 Merge: 6eb14bb 5ff0b8e Author: Jacob Appelbaum <jacob@appelbaum.net> Date: Mon Feb 25 10:48:31 2013 -0800 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe .gitignore | 4 + README.md | 8 +- decks/before_i_commit.testdeck | 2 +- docs/source/index.rst | 2 +- docs/source/nettests/nettests.blocking.rst | 4 +- docs/source/tests/dnsconsistency.rst | 180 ++++++++++++++++++++++++++++ docs/source/tests/dnstamper.rst | 180 ---------------------------- docs/source/writing_tests.rst | 6 +- inputs/README | 2 +- nettests/blocking/dnsconsistency.py | 173 ++++++++++++++++++++++++++ nettests/blocking/dnstamper.py | 166 ------------------------- nettests/blocking/http_requests.py | 10 +- nettests/manipulation/captiveportal.py | 21 ++- ooni/templates/httpt.py | 1 - ooni/templates/scapyt.py | 1 - ooni/utils/txagentwithsocks.py | 2 +- ooni/utils/txscapy.py | 2 +- requirements.txt | 4 - 18 files changed, 392 insertions(+), 376 deletions(-)