commit 960e52a95b446af73be8e4152f415aa804ab9fe1 Merge: 785da5c 880a4a5 Author: anadahz anadahz@users.noreply.github.com Date: Fri May 13 03:23:15 2016 +0000

Merge pull request #494 from TheTorProject/fix/localoptions

Implement fix for #493

ooni/deck.py | 73 ++++---- ooni/director.py | 12 +- ooni/errors.py | 2 + ooni/nettest.py | 394 ++++++++++++++++++++++++-------------------- ooni/oonicli.py | 5 +- ooni/reporter.py | 3 +- ooni/tests/test_deck.py | 56 ++++++- ooni/tests/test_director.py | 43 +++++ ooni/tests/test_nettest.py | 43 ++--- ooni/tests/test_oonicli.py | 49 +++++- 10 files changed, 412 insertions(+), 268 deletions(-)