commit 041c5df81eff3da190fb94f794f04b0ad696690f Merge: 90aa08c 5a924d1 Author: Arturo Filastò arturo@filasto.net Date: Sat Sep 6 17:51:04 2014 +0200

Merge pull request #348 from TheTorProject/fix/parasitictraceroute

Refactor Parasitictraceroute.

ooni/nettests/experimental/parasitictraceroute.py | 13 +++++++----- ooni/utils/txscapy.py | 22 +++++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-)