[tor-commits] [ooni-probe/master] Merge branch 'master' into feature/add_scapy_traceroute_protocol_rebased

[art at torproject.org]

commit 0ca415061de29139dd16b88038f113800862c00a
Merge: de64930 aa45aca
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Feb 28 17:59:56 2014 +0100

    Merge branch 'master' into feature/add_scapy_traceroute_protocol_rebased
    
    * master: (53 commits)
      Install pyrex-real so that new pip does not give error
      Update index of documentation page.
      Bump to v1.0.0-rc-7
      Add WARNING message to every run of ooniprobe.
      Expand the disclaimer in the README.md
      Update vagrant link to point to https site.
      Bump to version 1.0.0
      Add instructions on setting up development dependencies.
      Make the geoip related tests make a less stronger assertion.
      Make GeoIP AS and GeoIP City soft dependencies.
      Minor fixes to comments
      DNS-host-resolution-for-tls_handshake
      Bug-Fixes-for-tls_handshake
      Properly expand the home directory to that of the user running ooniprobe.
      Fix import error in test_managers.
      Properly handle the cancelled failure.
      Silence the dummy protocol
      Write test that reproduces HTTP test stalling condition.
      Call connectionLost to avoid dirty reactor.
      Pass the mock super socket in the ScapyFactory constructor
      ...

 .coveragerc                                 |    2 +
 .travis.yml                                 |    3 +-
 README.md                                   |   23 +-
 Vagrantfile                                 |   26 +-
 docs/source/index.rst                       |    2 +-
 ooni/__init__.py                            |    2 +-
 ooni/deck.py                                |   31 +-
 ooni/director.py                            |    4 +-
 ooni/errors.py                              |   14 +-
 ooni/geoip.py                               |   35 +-
 ooni/nettest.py                             |   32 +-
 ooni/nettests/experimental/tls_handshake.py |   36 +-
 ooni/oonibclient.py                         |   35 +-
 ooni/oonicli.py                             |    3 +
 ooni/reporter.py                            |    4 +-
 ooni/settings.py                            |    5 +-
 ooni/tasks.py                               |   12 +-
 ooni/templates/httpt.py                     |    6 -
 ooni/tests/__init__.py                      |    3 +
 ooni/tests/disabled_test_utils.py           |   21 -
 ooni/tests/test_deck.py                     |  130 +++++
 ooni/tests/test_director.py                 |   47 ++
 ooni/tests/test_geoip.py                    |   22 +
 ooni/tests/test_managers.py                 |    4 +-
 ooni/tests/test_nettest.py                  |   72 ++-
 ooni/tests/test_oonibclient.py              |   43 +-
 ooni/tests/test_reporter.py                 |   91 ++++
 ooni/tests/test_templates.py                |   43 ++
 ooni/tests/test_txscapy.py                  |   47 ++
 ooni/tests/test_utils.py                    |   22 +
 ooni/utils/__init__.py                      |    9 +-
 ooni/utils/onion.py                         |  704 ---------------------------
 requirements-dev.txt                        |    1 +
 33 files changed, 694 insertions(+), 840 deletions(-)