commit 858f09d0e30f14568b38958a2c682f0abb0f4a64 Merge: 65c90a0 e3a8aa5 Author: Arturo Filastò hellais@users.noreply.github.com Date: Wed Apr 30 18:45:54 2014 +0200

Merge pull request #307 from TheTorProject/fix/issue_h

Fix/issue h

ooni/deck.py | 15 ++++++++++----- ooni/oonicli.py | 2 +- ooni/tests/test_deck.py | 19 ++++++++++++------- 3 files changed, 23 insertions(+), 13 deletions(-)