commit 4e529ec9a64ae6c26a7bedf99360c126a75ab1ce Merge: 3ccb5f9 2e5647c Author: Arturo Filastò <hellais@users.noreply.github.com> Date: Fri Mar 7 16:55:18 2014 +0100 Merge pull request #290 from TheTorProject/feature/add_scapy_traceroute_protocol_rebased Feature/add scapy traceroute protocol rebased ooni/director.py | 14 +- ooni/errors.py | 4 + ooni/nettests/experimental/parasitictraceroute.py | 157 ++++--------- ooni/nettests/manipulation/traceroute.py | 165 +++++--------- ooni/reporter.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/utils/txscapy.py | 242 ++++++++++++++++++++- 7 files changed, 355 insertions(+), 231 deletions(-)