commit 8ff065d0b74eca770f1996c652159a74c821ef6c Merge: 4ecd3b6 c12bc4d Author: Isis Lovecruft isis@torproject.org Date: Tue Oct 9 18:46:58 2012 +0000

Merge branch 'master' of git://github.com/hellais/ooni-probe into hellais-test-pull

INSTALL | 67 +------------------------------------ docs/source/install.rst | 79 ++++++++++++++++++++++++++++++++++++++++++-- nettests/core/dnstamper.py | 40 ++++++++++++++++------ ooni/runner.py | 2 +- 4 files changed, 107 insertions(+), 81 deletions(-)