[tor-commits] [ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

[art at torproject.org]

commit 447ab389f0ae25c7cfb652e03927b88e2c549ab1
Merge: baab66b eb6a0f7
Author: Arturo Filastò <hellais at torproject.org>
Date:   Sat Jun 2 19:37:24 2012 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

 .gitignore                     |    3 +-
 docs/writing_tests.txt         |   12 --
 ooni/__init__.py               |    1 +
 ooni/log.py                    |   40 ++++++
 ooni/oonicli.py                |  139 --------------------
 ooni/ooniprobe.log             |    3 +-
 ooni/ooniprobe.py              |  272 +++++++++++++++-------------------------
 ooni/plugins/.bridget.py.swp   |  Bin 12288 -> 0 bytes
 ooni/plugins/.dnstamper.py.swp |  Bin 12288 -> 0 bytes
 ooni/plugins/blocking.py       |   41 ++++++
 ooni/plugins/bridget.py        |   36 ------
 ooni/plugins/dnstamper.py      |   22 ----
 ooni/plugins/dropin.cache      |   76 -----------
 ooni/plugins/httphost.py       |  122 ++++++++++++++++++
 ooni/plugins/skel.py           |   14 ++-
 ooni/plugoo/interface.py       |   21 +++
 ooni/plugoo/reports.py         |   43 +++----
 ooni/plugoo/tests.py           |  241 +++++++-----------------------------
 ooni/plugoo/work.py            |   71 ++++++++---
 ooni/scaffolding.py            |   67 ++++++++++
 ooni/skel.py                   |   10 --
 ooni/tests/worker_test.py      |   27 ----
 oonib/oonibackend.py           |    8 +-
 tests/test_tests.py            |   33 +++++
 tests/test_worker.py           |   18 +++
 25 files changed, 572 insertions(+), 748 deletions(-)