[tor-commits] [ooni-probe/master] Merge pull request #514 from TheTorProject/feature/web_connectivity

[art at torproject.org]

commit 1c030e17e5390e3417d7582a5b3613c8696e53b1
Merge: a62a614 c046653
Author: Arturo Filastò <arturo at filasto.net>
Date:   Mon May 30 17:39:59 2016 +0200

    Merge pull request #514 from TheTorProject/feature/web_connectivity
    
    Feature/web connectivity

 bin/oonireport                                     |   2 +-
 data/ooniprobe.conf.sample                         |   2 +-
 ooni/backend_client.py                             | 365 ++++++++++++++
 ooni/common/__init__.py                            |  10 +
 ooni/common/http_utils.py                          |  55 ++
 ooni/common/tcp_utils.py                           |  10 +
 ooni/common/txextra.py                             | 202 ++++++++
 ooni/deck.py                                       | 234 ++++++---
 ooni/deckgen/cli.py                                |  22 +-
 ooni/director.py                                   |  51 +-
 ooni/errors.py                                     |  42 +-
 ooni/geoip.py                                      |  25 +-
 ooni/nettest.py                                    |  23 +-
 ooni/nettests/blocking/web_connectivity.py         | 554 +++++++++++++++++++++
 .../manipulation/http_header_field_manipulation.py |   2 +-
 ooni/oonibclient.py                                | 221 --------
 ooni/oonicli.py                                    |  43 +-
 ooni/report/cli.py                                 |   2 +-
 ooni/report/tool.py                                |  32 +-
 ooni/reporter.py                                   | 270 +++-------
 ooni/settings.py                                   |   2 +-
 ooni/tasks.py                                      |   5 +-
 ooni/templates/httpt.py                            |  95 ++--
 ooni/templates/scapyt.py                           |   8 +-
 ooni/tests/mocks.py                                |  38 +-
 ooni/tests/test_common.py                          |  19 +
 ooni/tests/test_deck.py                            |  25 +-
 ooni/tests/test_director.py                        |   2 +
 ooni/tests/test_nettest.py                         |  13 +-
 ooni/tests/test_onion.py                           |  16 +
 ooni/tests/test_oonibclient.py                     |  47 +-
 ooni/tests/test_oonicli.py                         |  10 +-
 ooni/tests/test_reporter.py                        |  32 +-
 ooni/tests/test_templates.py                       |  14 +-
 ooni/tests/test_trueheaders.py                     |   2 +-
 ooni/tests/test_utils.py                           |  34 +-
 ooni/utils/__init__.py                             |  64 +--
 ooni/utils/log.py                                  |   2 +-
 ooni/utils/net.py                                  |  54 +-
 ooni/utils/onion.py                                |   8 +
 ooni/utils/socks.py                                |  25 +
 ooni/utils/trueheaders.py                          | 181 -------
 setup.py                                           |   1 +
 43 files changed, 1858 insertions(+), 1006 deletions(-)