[tor-commits] [ooni-probe/master] Fix the last conflicts, hopefully... argh...

commit 793f013cf2ca50f415398677dd12ab59ae9c57b4 Merge: 45cc771 428e8e8 Author: Arturo Filastò <art@torproject.org> Date: Mon Jul 9 16:41:48 2012 +0200 Fix the last conflicts, hopefully... argh... Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe Conflicts: ooni/plugins/captiveportal.py ooni/plugins/captiveportal.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)