commit 4fceacc408d79f632cbdb84ecce3faf4c69eb377 Merge: 15c3371 ea74298 Author: Arturo Filastò hellais@gmail.com Date: Sat Mar 24 01:45:49 2012 -0700

Merge pull request #1 from isislovecruft/dnstamper

Dnstamper

.gitignore | 3 +- HACKING | 16 +- TODO | 5 + assets/dns_servers.txt | 6 + assets/top-1m.txt | 11 + assets/top-1m.txt.bak |1000000 ++++++++++++++++++++++++++++++++++++++++++++++++ ooni-probe.conf | 7 +- plugoo/nodes.py | 79 +- plugoo/reports.py | 2 +- plugoo/tests.py | 2 +- tests/dnstamper.py | 123 +- tests/httphost.py | 5 +- 12 files changed, 1000204 insertions(+), 55 deletions(-)