[tor-commits] [ooni-probe/master] Merge branch 'master' into feature/better_testing

[art at torproject.org]

commit 9461a258aca6efdfb2ddd8eefdb10c97615c940b
Merge: 17bf4d3 30e4744
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Mar 7 16:39:54 2014 +0100

    Merge branch 'master' into feature/better_testing
    
    * master:
      Update changelog for 1.0.0
      Fix bug in initializing of the test instance.
      Fix bug that leads to not showing the help if an option is not present.
    
    Conflicts:
    	ooni/tasks.py

 ChangeLog.md    |   12 ++++++++++++
 ooni/deck.py    |   15 +++++++++------
 ooni/nettest.py |    5 ++++-
 3 files changed, 25 insertions(+), 7 deletions(-)