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

commit af274db0a78dd0287bf537b1935b3e4062dc85c6 Merge: fc0ee97 4258d6e Author: Arturo Filastò hellais@gmail.com Date: Sun Mar 4 22:54:33 2012 -0800

Merge branch 'node'

Conflicts: plugoo.py

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 +- 10 files changed, 460 insertions(+), 400 deletions(-)