commit a48ca0f2cd8a415787ae0145ad716b3e107b92e3 Merge: d482b29 7affab1 Author: Arturo Filastò <art@fuffa.org> Date: Fri Nov 16 10:14:11 2012 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: * Adding back in a few changes that got lost in an octopus battle. * Updated oonib requirements. * Rewrite of echo. * Minor change to Makefile. * Moved iface and ipaddr discovery function to ooni.utils.net. * Updated oonib requirements. * Rewrite of echo. * Minor change to Makefile. * Moved iface and ipaddr discovery function to ooni.utils.net. Makefile | 28 +++-- nettests/bridge_reachability/echo.py | 198 +++++++++++++------------------- ooni/utils/net.py | 206 +++++++++++++++++++++++++++++---- oonib/requirements.txt | 2 - 4 files changed, 278 insertions(+), 156 deletions(-)