commit f2d7c2935d2f44009a3810db0d68fc8385334180 Merge: 447ab38 b132993 Author: Arturo Filastò hellais@torproject.org Date: Sat Jun 2 20:36:43 2012 +0200

Merge github.com:hellais/ooni-probe

docs/writing_tests.md | 17 +++++++++++ ooni/date.py | 11 +++++++ ooni/lib/__init__.py | 9 ++++++ ooni/ooniprobe.py | 6 ++-- ooni/plugins/bridget.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++ ooni/plugins/httphost.py | 1 - ooni/plugoo/reports.py | 43 +++++++++++++++++++-------- ooni/plugoo/tests.py | 2 +- ooni/plugoo/work.py | 13 ++++++-- ooni/scaffolding.py | 19 +++++++---- tests/test_worker.py | 11 +++++++ 11 files changed, 175 insertions(+), 29 deletions(-)