[tor-commits] [ooni-probe/master] Merge branch 'master' of git://github.com/hellais/ooni-probe

[art at torproject.org]

commit 73a9e3ad221d103706996dba84131c08406d75c3
Merge: c8b2d41 3fb8b81
Author: Arturo Filastò <arturo at filasto.net>
Date:   Tue Jul 24 12:49:45 2012 +0200

    Merge branch 'master' of git://github.com/hellais/ooni-probe

 TODO                                 |    2 +
 ooni/assets/captive_portal_tests.txt |    4 +
 ooni/assets/redirects.yaml           |   17 +
 ooni/config.py                       |   53 ---
 ooni/date.py                         |   11 -
 ooni/example_plugins/examplescapy.py |   49 +++
 ooni/example_plugins/skel.py         |   29 ++
 ooni/lib/Makefile                    |   18 +-
 ooni/lib/rfc3339.py                  |  283 ++++++++++++++++
 ooni/log.py                          |   40 ---
 ooni/logo.py                         |  214 ------------
 ooni/ooni-probe.conf                 |   23 ++
 ooni/ooniprobe.py                    |   45 ++-
 ooni/plugins/blocking.py             |    9 +-
 ooni/plugins/bridget.py              |    2 +-
 ooni/plugins/captiveportal.py        |  620 ++++++++++++++++++++++++++++++++++
 ooni/plugins/chinatrigger.py         |    6 +-
 ooni/plugins/daphn3.py               |  100 ++++++
 ooni/plugins/examplescapy.py         |   49 ---
 ooni/plugins/httphost.py             |   11 +-
 ooni/plugins/httpt.py                |   61 +++-
 ooni/plugins/skel.py                 |   29 --
 ooni/plugins/tcpconnect.py           |   14 +-
 ooni/plugoo/interface.py             |   31 ++-
 ooni/plugoo/nodes.py                 |    2 +-
 ooni/plugoo/reports.py               |   14 +-
 ooni/plugoo/tests.py                 |   73 ++++-
 ooni/plugoo/work.py                  |  123 ++-----
 ooni/protocols/daphn3.py             |  284 ++++++++++++++++
 ooni/protocols/http.py               |   29 ++-
 ooni/protocols/scapy.py              |   55 ---
 ooni/protocols/scapyproto.py         |   55 +++
 ooni/scaffolding.py                  |    4 +-
 ooni/utils.py                        |  146 --------
 ooni/utils/__init__.py               |  146 ++++++++
 ooni/utils/config.py                 |   53 +++
 ooni/utils/date.py                   |   22 ++
 ooni/utils/log.py                    |   43 +++
 ooni/utils/logo.py                   |  214 ++++++++++++
 oonib/backends/daphn3.py             |   37 ++
 oonib/backends/dns.py                |   16 +
 oonib/backends/http.py               |   74 ++++
 oonib/common.py                      |    6 +
 oonib/dnsbackend.py                  |   16 -
 oonib/httpbackend.py                 |   74 ----
 oonib/oonibackend.conf               |    8 +
 oonib/oonibackend.py                 |   17 +-
 tests/assets/ipports.txt             |    2 +
 tests/assets/urllist.txt             |    3 +
 tests/test_plugins.py                |   40 +++
 tests/test_tests.py                  |   17 +-
 51 files changed, 2420 insertions(+), 873 deletions(-)