[tor-commits] [ooni-probe/master] Merge branch 'master' of https://github.com/hellais/ooni-probe into dnstamper

[art at torproject.org]

commit 484c5656c922eb114da2dac51773df3f66d236f2
Merge: 022bf73 15c3371
Author: Isis Lovecruft <isis at patternsinthevoid.net>
Date:   Wed Mar 21 18:36:01 2012 -0700

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

 README            |   57 +++++++++++++++++++++++
 old/README        |   57 -----------------------
 ooni-probe.conf   |    3 +-
 plugoo/tests.py   |   25 ++++++++--
 plugoo/workers.py |   36 ++++++++++++++
 tests/httphost.py |  132 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/tcpscan.py  |    2 +-
 utils.py          |    2 +-
 8 files changed, 249 insertions(+), 65 deletions(-)