commit 703cc52947fd1c35d57360c6301a1c0466ee60f7 Merge: 6a44287 f7bcdeb Author: Simone Basso bassosimone@gmail.com Date: Tue Nov 17 21:03:29 2015 +0100

Merge pull request #427 from TheTorProject/fix/travis

Fix/travis

.travis.yml | 23 ++++++++++++++++++++--- ooni/tests/test_oonicli.py | 2 ++ 2 files changed, 22 insertions(+), 3 deletions(-)