commit 2f584dcb30f32c920f3e73cd1f25fd46f4756ec5 Merge: 6e1aa81 80fce04 Author: Arturo Filastò hellais@gmail.com Date: Sun Dec 2 09:48:38 2012 -0800

Merge pull request #14 from aagbsn/dnstamper_fixes

Dnstamper fixes

docs/source/tests/dnstamper.rst | 2 +- nettests/blocking/dnstamper.py | 22 ++++++++++++++++++++-- ooni/nettest.py | 2 +- ooniprobe.conf.sample | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-)