[tor-commits] [ooni-probe/master] Merge branch 'dev-missing-test'

[isis at torproject.org]

commit 705587ae5d974bca56d0ac4c407bec4c312c37f4
Merge: d8d286a d38df33
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Dec 18 04:07:47 2012 +0000

    Merge branch 'dev-missing-test'

 ooni/runner.py |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)