commit fe07c4ade0d706963b3f9324c6c6ccf4b98df9b3 Merge: 436a232 f467b3f Author: Arturo Filastò arturo@filasto.net Date: Wed Sep 24 10:46:11 2014 +0200

Merge pull request #352 from TheTorProject/feature/regression_testing

Feature/regression testing

.travis.yml | 8 ++++++-- ooni/settings.py | 4 ++-- ooni/tests/bases.py | 5 ++++- ooni/utils/net.py | 10 ++++++++++ 4 files changed, 22 insertions(+), 5 deletions(-)