[tor-commits] [ooni-probe/master] Merge branch 'workers'

[art at torproject.org]

commit c8cec8280f2c2eab9168a058c453e504de174545
Merge: 5d6b1e2 d5fdae9
Author: Arturo Filastò <hellais at gmail.com>
Date:   Tue Mar 20 20:33:51 2012 -0700

    Merge branch 'workers'

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