commit b6a2a01629d5a22fe04fcdbc791fc5f89ad1784b Merge: 211532c e7dcee3 Author: Arturo Filastò art@fuffa.org Date: Mon Dec 30 17:34:37 2013 +0100

Merge branch 'master' into fix/misc

* master: Use the non raw scapy super socket when using Mac OS X Use generic L3RawSocket rather than OS specific L3PacketSocket

Conflicts: ooni/utils/txscapy.py

ooni/utils/txscapy.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)