commit 997a7473710f8d732549bad8ad1a0459c336f7de Merge: cc1457f 1f7f674 Author: Arturo Filastò art@fuffa.org Date: Fri Mar 1 12:34:44 2013 +0100

Merge remote-tracking branch 'thetorproject/master'

* thetorproject/master: Flatten the reporter keys Return something in txscapy Update before_i_commit script to make it work (cherry picked from commit 9cdf5596c8f16cac819afdaf1b9b537b36f796a6) Refactor logic for importing scapy related functions

decks/before_i_commit.testdeck | 6 +++- ooni/reporter.py | 15 ++++------ ooni/utils/net.py | 2 +- ooni/utils/txscapy.py | 56 ++++++++++++++++++++++++++++++---------- scripts/example_parser.py | 5 +-- 5 files changed, 56 insertions(+), 28 deletions(-)