commit 9cad53b7a979e5c8478f51dca32a191c2b31e0a1 Merge: 02aff59 5f568cb Author: Arturo Filastò art@fuffa.org Date: Tue Feb 26 15:40:18 2013 +0100

Merge branch 'master' into experimental-tests

* master: (32 commits) Add sudo to apt-key Add note on wheezy and natty fix text where we called a SOCKS port an orport fixup decks/before_i_commit.testdeck to actually run against master add mkdir Add default config file remove python-pcapy add missing ; Use Tor mirror of scapy-02-25-2013-tip.zip Add wheezy support for arma to test Make the final output more generic Update README.md to explain easy setup steps Add stable mirror to requirements.txt Set a default collector Catch 302 redirect loops and log.err not log.warn Remove dependency on _WrappingFactory Remove some superfluous requirements from the requirements.txt Make sure to import Gen, SetGen and MTU even when pypcap is and libdnet are not installed Rename DNS Tamper Test to DNS Consistency Test Apply patch from dma in #8009 #8008 ...

.gitignore | 4 + README.md | 73 ++++++++--- apt.key | Bin 0 -> 6624 bytes collector | 1 + decks/before_i_commit.testdeck | 33 +++-- docs/source/index.rst | 2 +- docs/source/nettests/nettests.blocking.rst | 4 +- docs/source/tests/dnsconsistency.rst | 180 ++++++++++++++++++++++++++++ docs/source/tests/dnsspoof.rst | 2 +- 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/manipulation/captiveportal.py | 21 ++-- nettests/manipulation/traceroute.py | 2 +- ooni/oonicli.py | 3 +- ooni/runner.py | 9 ++ ooni/utils/txagentwithsocks.py | 2 +- ooni/utils/txscapy.py | 2 +- oonib/requirements.txt | 8 +- ooniprobe.conf.sample | 2 +- requirements.txt | 28 +++-- setup-dependencies.sh | 83 +++++++++++++ 24 files changed, 577 insertions(+), 409 deletions(-)