commit 8f11b7493b6c4d6c0b8ec2855d97e25c8e003074 Merge: 9442790 93fdf3a Author: Arturo Filastò art@fuffa.org Date: Mon Aug 25 01:27:48 2014 +0200

Merge branch 'feature/12919'

* feature/12919: PEP8 cleanup The measurement timeout now can be set by a nettest

ooni/nettests/blocking/bridge_reachability.py | 6 ------ ooni/tasks.py | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-)