commit a979d19d2b843fc8e723f44bb5597b57215f963b Merge: 3af48cc 1d8240c Author: Arturo Filastò hellais@torproject.org Date: Fri Aug 17 21:32:53 2012 -0700

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

Conflicts: ooni/ooniprobe.py

ooni/ooniprobe.py | 2 +- ooni/plugins/daphn3.py | 2 + oonib/INSTALL | 4 ++ oonib/report/api.py | 98 +++++++++++++++++++++++++++++++++++++++++++ oonib/report/db/__init__.py | 33 ++++++++++++++ oonib/report/db/models.py | 41 ++++++++++++++++++ 6 files changed, 179 insertions(+), 1 deletions(-)

diff --cc ooni/plugins/daphn3.py index a6d51b0,bdba5d9..6911623 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@@ -134,8 -133,11 +134,10 @@@ class daphn3Test(OONITest) d = endpoint.connect(self.factory) d.addErrback(self._failure) return d - #return endpoint.connect(Daphn3ClientFactory)

def load_assets(self): + if not self.local_options: + return {} if not self.steps: print "Error: No assets!" self.end()