commit 6eb14bb4a14eafa90fa22e1321767131b1ec5179 Merge: 4188635 e8fdc80 Author: Jacob Appelbaum <jacob@appelbaum.net> Date: Thu Jan 17 11:43:05 2013 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe .gitignore | 1 - README.md | 2 +- .../_static/images/ooniprobe-architecture.png | Bin 0 -> 96574 bytes docs/source/architecture.rst | 144 +++++++++++++++- docs/source/index.rst | 1 + docs/source/reports.rst | 2 +- docs/source/tests/dnsspoof.rst | 2 +- .../tests/http_header_field_manipulation.rst | 9 +- docs/source/writing_tests.rst | 4 + nettests/blocking/http_requests.py | 23 ++- nettests/blocking/tcpconnect.py | 12 +- nettests/examples/example_dnst.py | 6 +- .../manipulation/http_header_field_manipulation.py | 7 + ooni/__init__.py | 2 +- ooni/inputunit.py | 3 +- ooni/nettest.py | 84 +++++++++- ooni/oonicli.py | 8 +- ooni/runner.py | 46 ++++-- ooni/templates/dnst.py | 34 +++- ooni/templates/httpt.py | 24 ++- ooni/utils/net.py | 8 +- ooni/utils/txagentwithsocks.py | 130 +-------------- oonib/README.md | 94 +++++++++++ ooniprobe.conf.sample | 4 + requirements.txt | 3 +- scripts/archive_reports.py | 174 ++++++++++++++++++++ 26 files changed, 626 insertions(+), 201 deletions(-)