[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'hackerberry/master'

[isis at torproject.org]

commit 3d956cf7683bf25cae6975006d0aa4e828813dd3
Merge: cf764e5 9abf23f
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Nov 4 05:28:44 2012 +0000

    Merge remote-tracking branch 'hackerberry/master'
    
    Conflicts:
    	ooni/nettest.py

 ooni/bridget/tests/echo.py |    2 +-
 ooni/nettest.py            |    2 +-
 ooni/templates/httpt.py    |    4 ++--
 ooni/templates/scapyt.py   |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)