commit 4f6f2d4ef2b25dbd738cbd980d7be913badf34a1 Merge: 00fec3b ab2a15e Author: Isis Lovecruft isis@patternsinthevoid.net Date: Wed Mar 14 15:28:25 2012 -0700

Merge branch 'master' of https://github.com/hellais/ooni-probe

TODO | 40 ++++++++++++++++++ assets/example.txt | 2 + assets/tcpscan.txt | 1 + ooniprobe.py | 27 ++++++++----- plugoo/__init__.py | 29 +++++++++++++- plugoo/assets.py | 1 - plugoo/tests.py | 6 +- tests/bridget.py | 2 +- tests/squid.py | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/tcpscan.py | 86 ++++++++++++++++++++++++++++++++++++++ tests/traceroute.py | 2 +- 11 files changed, 292 insertions(+), 17 deletions(-)