commit 65c90a082030a37e1e3c2bc33f02d3e76fd41c65 Merge: 4f5d910 2822871 Author: Arturo Filastò hellais@users.noreply.github.com Date: Wed Apr 30 18:38:44 2014 +0200

Merge pull request #297 from TheTorProject/feature/tor_version

Add support for adding tor version to the bridge_reachability report.

.gitignore | 35 +++++++++---- ooni/director.py | 4 +- ooni/errors.py | 3 ++ ooni/managers.py | 7 ++- ooni/nettest.py | 29 +++++++---- ooni/nettests/blocking/bridge_reachability.py | 69 ++++++++++++++++--------- ooni/nettests/blocking/dns_consistency.py | 3 +- ooni/oonicli.py | 28 ++++++---- ooni/tests/test_onion.py | 8 +++ ooni/tests/test_oonicli.py | 30 ++++++----- ooni/utils/__init__.py | 3 -- ooni/utils/log.py | 2 + ooni/utils/onion.py | 50 ++++++++++++++++++ scripts/install_on_planetlab.sh | 48 +++++++++++++---- 14 files changed, 231 insertions(+), 88 deletions(-)