commit 30e47444a861d2a74002a7e9121d9f7b5e88f4db Merge: 58aab66 bb44733 Author: Arturo Filastò art@fuffa.org Date: Fri Mar 7 13:31:33 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe: Fix bug that leads to not showing the help if an option is not present.

ooni/deck.py | 15 +++++++++------ ooni/nettest.py | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-)