[tor-commits] [ooni-probe/master] Merge branch 'master' into feature/bridget

[art at torproject.org]

commit 8c9ee9225720752bf4e938a9d41d39cd5482dce7
Merge: 9b7fc3f efb85ae
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Mar 1 19:03:07 2014 +0100

    Merge branch 'master' into feature/bridget
    
    * master:
      Fix bug in initializing of the test instance.

 ooni/tasks.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)