commit 6837a3ccccb01aea0381defa20847001c145f3a1 Merge: dbfaf07 5a20acd Author: Simone Basso <bassosimone@gmail.com> Date: Tue Dec 1 21:41:43 2015 +0100 Merge pull request #437 from TheTorProject/feature/fix_annotation Fix annotations in ooniprobe ooni/nettest.py | 4 +++- ooni/oonicli.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-)