[tor-commits] [ooni-probe/master] Merge branch 'fix/use_generic_L3socket'

Fri Jan 3 13:29:42 UTC 2014

commit e7dcee39a6e8d18310b7dae2ff6ace77c84d16d7
Merge: 41e4683 ce36a45
Author: Arturo FilastÃ² <art at fuffa.org>
Date:   Mon Dec 30 16:32:22 2013 +0100

    Merge branch 'fix/use_generic_L3socket'
    
    * fix/use_generic_L3socket:
      Use the non raw scapy super socket when using Mac OS X
      Use generic L3RawSocket rather than OS specific L3PacketSocket

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