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

[ioerror at torproject.org]

commit 4188635fb47b7334b1430d833944cf19bff10d76
Merge: 9a16118 fb9d25b
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sun Dec 9 10:46:50 2012 +0630

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

 nettests/third_party/netalyzr.py |    1 -
 ooni/oonicli.py                  |    8 +++++++-
 ooni/reporter.py                 |    2 +-
 ooni/runner.py                   |    1 +
 4 files changed, 9 insertions(+), 3 deletions(-)