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

[art at torproject.org]

commit b13aa4db0842c25d394e1d217d01f7418ba08fa0
Merge: 739229d af274db
Author: Isis Lovecruft <isis at patternsinthevoid.net>
Date:   Sun Mar 4 23:01:36 2012 -0800

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

 logo.py             |    2 +-
 ooniprobe.py        |    3 +-
 plugoo.py           |  388 ---------------------------------------------------
 plugoo/__init__.py  |   53 +++++++
 plugoo/assets.py    |   45 ++++++
 plugoo/nodes.py     |   71 ++++++++++
 plugoo/reports.py   |  170 ++++++++++++++++++++++
 plugoo/tests.py     |  105 ++++++++++++++
 tests/bridget.py    |   10 +-
 tests/dnstamper.py  |    8 +-
 tests/traceroute.py |    7 +-
 11 files changed, 461 insertions(+), 401 deletions(-)