commit 5252b00b29f8c9570ecb9533f4577c0a5b69f06f Merge: a0fc5e6 dd58c40 Author: Simone Basso <bassosimone@gmail.com> Date: Mon Apr 4 18:41:52 2016 +0200 Merge pull request #456 from TheTorProject/feature/json_reports Feature/json reports .travis.yml | 4 - ooni/deckgen/processors/citizenlab_test_lists.py | 5 + ooni/director.py | 11 +- ooni/errors.py | 3 + ooni/nettest.py | 17 +-- ooni/nettests/blocking/dns_consistency.py | 29 +++-- ooni/nettests/blocking/http_requests.py | 11 +- ooni/nettests/experimental/daphne.py | 121 ++++++++++++++++++ ooni/nettests/manipulation/captiveportal.py | 2 +- ooni/nettests/manipulation/daphne.py | 121 ------------------ ooni/nettests/manipulation/http_host.py | 4 +- .../manipulation/http_invalid_request_line.py | 7 +- ooni/oonibclient.py | 3 - ooni/oonicli.py | 50 ++++---- ooni/otime.py | 79 +----------- ooni/report/tool.py | 4 +- ooni/reporter.py | 136 ++++++++++++++------- ooni/tasks.py | 5 +- ooni/templates/dnst.py | 107 +++++++++++----- ooni/templates/httpt.py | 50 ++++++-- ooni/templates/scapyt.py | 12 +- ooni/templates/tcpt.py | 1 + ooni/tests/test_director.py | 6 +- ooni/tests/test_oonicli.py | 17 +-- ooni/tests/test_otime.py | 14 --- ooni/tests/test_reporter.py | 23 +++- ooni/tests/test_templates.py | 44 ++++++- ooni/tests/test_trueheaders.py | 12 +- ooni/tests/test_utils.py | 10 +- ooni/utils/__init__.py | 13 +- ooni/utils/log.py | 2 +- ooni/utils/trueheaders.py | 2 +- requirements.txt | 2 +- 33 files changed, 526 insertions(+), 401 deletions(-)