[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'tpo-common/master'



commit 8d3a668a56b51bea4172f88fc0466d841e056fc1
Merge: 4142c7f 9212cba
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Tue Dec 18 00:40:40 2012 +0000

    Merge remote-tracking branch 'tpo-common/master'

 README.md                                          |   51 +--
 before_i_commit.sh                                 |   29 --
 before_i_commit.testdeck                           |   33 --
 bin/INSTRUCTIONS                                   |   15 -
 bin/Makefile                                       |   54 ---
 bin/canary                                         |   27 --
 bin/old_ooniprobe                                  |   80 ----
 bin/oonib                                          |    4 -
 decks/before_i_commit.testdeck                     |   33 ++
 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/architecture.rst                       |  204 ++++++++++
 docs/source/conf.py                                |    4 +-
 docs/source/index.rst                              |    6 +-
 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/reports.rst                            |    9 +-
 docs/source/tests/dnsspoof.rst                     |  111 ++++++
 docs/source/tests/dnstamper.rst                    |    6 +-
 .../tests/http_header_field_manipulation.rst       |  343 ++++++++++++++++
 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                      |  275 +++++++++++---
 nettests/blocking/__init__.py                      |    1 +
 nettests/blocking/dnstamper.py                     |    6 +-
 nettests/examples/example_http_checksum.py         |   27 ++
 nettests/third_party/netalyzr.py                   |    1 -
 ooni/__init__.py                                   |    3 +-
 ooni/config.py                                     |   37 +-
 ooni/kit/daphn3.py                                 |    4 +-
 ooni/kit/domclass.py                               |   60 ++--
 ooni/lib/__init__.py                               |    5 -
 ooni/lib/secdev.org.pem                            |   20 -
 ooni/nettest.py                                    |   30 +-
 ooni/nodes.py                                      |  174 --------
 ooni/oonicli.py                                    |   36 +--
 ooni/otime.py                                      |    3 -
 ooni/reporter.py                                   |  100 +++---
 ooni/runner.py                                     |   62 ++--
 ooni/templates/dnst.py                             |   57 ++--
 ooni/templates/httpt.py                            |    4 -
 ooni/templates/scapyt.py                           |    5 -
 ooni/utils/__init__.py                             |   38 ++-
 ooni/utils/geodata.py                              |   31 +--
 ooni/utils/hacks.py                                |    7 -
 ooni/utils/log.py                                  |   38 +-
 ooni/utils/net.py                                  |   13 -
 ooni/utils/txscapy.py                              |   29 +-
 oonib/config.py                                    |   10 +
 oonib/oonibackend.py                               |    4 +-
 oonib/report/__init__.py                           |    3 -
 oonib/report/api.py                                |    6 +-
 oonib/report/file_collector.py                     |   96 ++++--
 oonib/requirements.txt                             |   40 +--
 oonib/runner.py                                    |    3 +
 oonib/testhelpers/ssl_helpers.py                   |    2 +-
 requirements.txt                                   |    2 -
 scripts/before_i_commit.sh                         |   42 ++
 scripts/example_parser.py                          |   22 +
 scripts/submit-patch                               |  100 +++++
 setup.py                                           |   37 ++
 submit-patch                                       |  100 -----
 tests/test_runner.py                               |   20 +-
 tests/test_utils.py                                |   20 +
 to-be-ported/TODO                                  |  418 --------------------
 to-be-ported/spec/proxooni-spec.txt                |   65 ---
 to-be-ported/very-old/TODO.plgoons                 |   79 ----
 to-be-ported/very-old/TO_BE_PORTED                 |   14 -
 to-be-ported/very-old/ooni-probe.diff              |  358 -----------------
 to-be-ported/very-old/ooni/#namecheck.py#          |   39 --
 to-be-ported/very-old/ooni/.DS_Store               |  Bin 15364 -> 0 bytes
 to-be-ported/very-old/ooni/__init__.py             |   12 -
 to-be-ported/very-old/ooni/command.py              |  250 ------------
 to-be-ported/very-old/ooni/dns_poisoning.py        |   43 --
 to-be-ported/very-old/ooni/dnsooni.py              |  356 -----------------
 to-be-ported/very-old/ooni/helpers.py              |   38 --
 to-be-ported/very-old/ooni/http.py                 |  306 --------------
 to-be-ported/very-old/ooni/input.py                |   33 --
 to-be-ported/very-old/ooni/namecheck.py            |   39 --
 .../very-old/ooni/plugins/dnstest_plgoo.py         |   84 ----
 to-be-ported/very-old/ooni/plugins/http_plgoo.py   |   70 ----
 to-be-ported/very-old/ooni/plugins/marco_plgoo.py  |  377 ------------------
 to-be-ported/very-old/ooni/plugins/proxy_plgoo.py  |   69 ----
 .../very-old/ooni/plugins/simple_dns_plgoo.py      |   35 --
 to-be-ported/very-old/ooni/plugins/tcpcon_plgoo.py |  278 -------------
 to-be-ported/very-old/ooni/plugins/tor.py          |   80 ----
 to-be-ported/very-old/ooni/plugins/torrc           |    9 -
 to-be-ported/very-old/ooni/plugooni.py             |  106 -----
 to-be-ported/very-old/ooni/transparenthttp.py      |   41 --
 var/old_notes.txt                                  |  418 ++++++++++++++++++++
 var/proxooni-spec.txt                              |   65 +++
 var/secdev.org.pem                                 |   20 +
 102 files changed, 2336 insertions(+), 4237 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits