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

[art at torproject.org]

commit b829278e5f94b7b0faa261f466318e3c5efb39fa
Merge: 9dcd60b 3b830b6
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Dec 6 22:39:44 2012 +0100

    Merge branch 'master' of github.com:hellais/ooni-probe
    
    * 'master' of github.com:hellais/ooni-probe:
      Make nettests/* python modules
      Add nettest apidoc
      Set release version to 0.1-alpha
      Add references to classes in writing_tests
      Add documentation for the DNSSpoof test
      Add documentation for HTTPHeaderFieldManipulation
      Clean up writing_tests.rst
      Remove redundant heading
      Add automodule for tcpt to ooni.templates.rst
      Use section headers
      Add documentation and examples templates httpt and dnst
      Clean up index.rst
      Add docstrings to ooni/runner.py
      Remove automodule for ooni/__init__.py
      Add docstrings to network helper functions
      Add dnst to ooni.templates.rst
      Fix spelling in test documentation
      call launch_tor with the tor_binary from config
      Use HTTPS where available

 README.md                                          |   14 +-
 docs/source/api/modules.rst                        |    7 -
 docs/source/api/ooni.rst                           |    8 -
 docs/source/api/ooni.templates.rst                 |   22 +-
 docs/source/api/ooni.utils.rst                     |    2 -
 docs/source/conf.py                                |    4 +-
 docs/source/index.rst                              |    5 +-
 docs/source/nettests/modules.rst                   |    8 +
 docs/source/nettests/nettests.blocking.rst         |   26 ++
 docs/source/nettests/nettests.examples.rst         |   58 ++++
 docs/source/nettests/nettests.experimental.rst     |   58 ++++
 docs/source/nettests/nettests.manipulation.rst     |   58 ++++
 docs/source/nettests/nettests.scanning.rst         |   10 +
 docs/source/nettests/nettests.third_party.rst      |   10 +
 docs/source/tests/dnsspoof.rst                     |  111 +++++++
 docs/source/tests/dnstamper.rst                    |    6 +-
 .../tests/http_header_field_manipulation.rst       |  346 ++++++++++++++++++++
 docs/source/tests/http_host.rst                    |   10 +-
 docs/source/tests/http_invalid_request_line.rst    |    4 +-
 docs/source/tests/http_requests.rst                |    4 +-
 docs/source/tests/tcpconnect.rst                   |    2 +-
 docs/source/tests/traceroute.rst                   |    2 +-
 docs/source/writing_tests.rst                      |  271 +++++++++++++---
 nettests/blocking/__init__.py                      |    1 +
 nettests/examples/example_http_checksum.py         |   27 ++
 ooni/runner.py                                     |    8 +
 ooni/utils/txscapy.py                              |    5 +
 27 files changed, 993 insertions(+), 94 deletions(-)