commit 761f63181e19d340a6adb74ba186e10f054965eb Merge: 2cf45fe 0c702b6 Author: Arturo Filastò art@fuffa.org Date: Thu Feb 20 12:20:03 2014 +0000

Merge branch 'master' into feature/improve_unittesting

* master: Make GeoIP AS and GeoIP City soft dependencies. Minor fixes to comments DNS-host-resolution-for-tls_handshake Bug-Fixes-for-tls_handshake Properly expand the home directory to that of the user running ooniprobe. Fix import error in test_managers. Properly handle the cancelled failure. Silence the dummy protocol Write test that reproduces HTTP test stalling condition.

Conflicts: ooni/nettest.py

ooni/errors.py | 11 ++++- ooni/geoip.py | 35 ++++++------- ooni/nettest.py | 30 +++++------ ooni/nettests/experimental/tls_handshake.py | 36 ++++++++++++-- ooni/reporter.py | 2 +- ooni/settings.py | 5 +- ooni/tasks.py | 12 ++--- ooni/tests/test_managers.py | 2 +- ooni/tests/test_nettest.py | 71 +++++++++++++++++++++++++++ 9 files changed, 153 insertions(+), 51 deletions(-)