[tor-commits] [ooni-probe/master] Merge branch 'master' of git://github.com/hellais/ooni-probe
art at torproject.org
art at torproject.org
Tue Jul 24 11:36:46 UTC 2012
commit c8b2d416b5dc1881c81ec958793a0570ea211001
Merge: 1f7c456 0adc1ba
Author: Arturo Filastò <arturo at filasto.net>
Date: Sat Jun 16 18:25:34 2012 +0200
Merge branch 'master' of git://github.com/hellais/ooni-probe
.gitignore | 3 +-
HACKING | 36 +-
LICENSE | 26 +
assets/example.txt | 2 -
assets/tcpscan.txt | 1 -
config.py | 53 -
docs/Makefile | 153 +
docs/source/conf.py | 242 +
docs/source/index.rst | 21 +
docs/source/tutorial.rst | 12 +
docs/source/writing_tests.rst | 7 +
docs/writing_tests.md | 17 +
install.txt | 4 -
lib/traceroute.py | 32 -
lib/txtraceroute.py | 389 -
logo.py | 214 -
nodes.conf | 53 -
old-to-be-ported-code/AUTHORS | 3 +
old-to-be-ported-code/CHANGES.yaml | 5 +
old-to-be-ported-code/HACKING | 21 +
old-to-be-ported-code/INSTALL | 8 +
old-to-be-ported-code/LICENSE | 28 +
old-to-be-ported-code/MANIFEST.in | 6 +
old-to-be-ported-code/Makefile | 182 +
old-to-be-ported-code/README.API | 29 +
old-to-be-ported-code/README.examples | 10 +
old-to-be-ported-code/README.rst | 40 +
old-to-be-ported-code/RFA.md | 101 +
old-to-be-ported-code/TODO | 418 +
old-to-be-ported-code/TODO.plgoons | 79 +
old-to-be-ported-code/bin/ooni-probe | 10 +
old-to-be-ported-code/keyword-lists/Makefile | 3 +
old-to-be-ported-code/keyword-lists/keyfile | 256 +
old-to-be-ported-code/list/list.txt | 2 +
old-to-be-ported-code/ooni-probe.diff | 358 +
old-to-be-ported-code/ooni/.DS_Store | Bin 0 -> 15364 bytes
old-to-be-ported-code/ooni/__init__.py | 12 +
old-to-be-ported-code/ooni/captive_portal.py | 62 +
old-to-be-ported-code/ooni/command.py | 250 +
old-to-be-ported-code/ooni/common.py | 139 +
old-to-be-ported-code/ooni/dns_cc_check.py | 48 +
old-to-be-ported-code/ooni/dns_poisoning.py | 43 +
old-to-be-ported-code/ooni/dnsooni.py | 356 +
old-to-be-ported-code/ooni/empty.txt | 9 +
old-to-be-ported-code/ooni/helpers.py | 38 +
old-to-be-ported-code/ooni/http.py | 306 +
old-to-be-ported-code/ooni/input.py | 33 +
old-to-be-ported-code/ooni/namecheck.py | 39 +
old-to-be-ported-code/ooni/output.py | 21 +
.../ooni/plugins/captiveportal_plgoo.py | 55 +
.../ooni/plugins/dnstest_plgoo.py | 84 +
old-to-be-ported-code/ooni/plugins/http_plgoo.py | 70 +
old-to-be-ported-code/ooni/plugins/marco_plgoo.py | 377 +
.../ooni/plugins/netalyzr_plgoo.py | 30 +
.../ooni/plugins/old_stuff_to_convert/README | 47 +
.../plugins/old_stuff_to_convert/README.automation | 11 +
.../ooni/plugins/old_stuff_to_convert/TODO | 6 +
.../plugins/old_stuff_to_convert/cached-consensus |11724 ++++++++++++++++++++
.../plugins/old_stuff_to_convert/connectback.sh | 56 +
.../plugins/old_stuff_to_convert/dirconntest.sh | 52 +
.../plugins/old_stuff_to_convert/dns-checker.sh | 7 +
.../old_stuff_to_convert/generic-host-test.sh | 33 +
.../ooni/plugins/old_stuff_to_convert/host-prep.sh | 20 +
.../plugins/old_stuff_to_convert/install-probe.sh | 27 +
.../ooni/plugins/old_stuff_to_convert/run-tests.sh | 11 +
.../plugins/old_stuff_to_convert/twitter-test.sh | 33 +
old-to-be-ported-code/ooni/plugins/proxy_plgoo.py | 69 +
.../ooni/plugins/simple_dns_plgoo.py | 35 +
old-to-be-ported-code/ooni/plugins/skel_plgoo.py | 17 +
old-to-be-ported-code/ooni/plugins/skel_plgoo.yaml | 33 +
old-to-be-ported-code/ooni/plugins/tcpcon_plgoo.py | 278 +
old-to-be-ported-code/ooni/plugins/tor.py | 80 +
old-to-be-ported-code/ooni/plugins/torrc | 9 +
old-to-be-ported-code/ooni/plugooni.py | 106 +
old-to-be-ported-code/ooni/report.py | 22 +
old-to-be-ported-code/ooni/transparenthttp.py | 41 +
old-to-be-ported-code/ooni/yamlooni.py | 40 +
old-to-be-ported-code/proxy-lists/Makefile | 11 +
old-to-be-ported-code/proxy-lists/README | 9 +
old-to-be-ported-code/proxy-lists/italy-dns.txt | 46 +
.../proxy-lists/italy-http-block-pages-notes.txt | 62 +
.../proxy-lists/italy-http-block-pages.txt | 5 +
.../proxy-lists/parse-trusted-xff.sh | 16 +
old-to-be-ported-code/proxy-lists/trusted-xff.html | 7789 +++++++++++++
old-to-be-ported-code/reports/marco-1.yamlooni | 86 +
old-to-be-ported-code/reports/marco-2.yamlooni | 60 +
old-to-be-ported-code/reports/marco.log | 4672 ++++++++
old-to-be-ported-code/reports/marco.yamlooni | 241 +
old-to-be-ported-code/reports/marco_certs-1-2.out | 307 +
old-to-be-ported-code/reports/marco_certs-1.out | 5850 ++++++++++
old-to-be-ported-code/reports/marco_certs-2.out | 1182 ++
old-to-be-ported-code/reports/marco_certs.out | 1900 ++++
old-to-be-ported-code/setup.py | 10 +
old-to-be-ported-code/spec/proxooni-spec.txt | 65 +
old-to-be-ported-code/test-lists/Makefile | 7 +
old-to-be-ported-code/tests/test_import.py | 10 +
old-to-be-ported-code/third-party/Makefile | 3 +
old-to-be-ported-code/third-party/README | 14 +
old/AUTHORS | 3 -
old/CHANGES.yaml | 5 -
old/HACKING | 21 -
old/INSTALL | 8 -
old/LICENSE | 28 -
old/MANIFEST.in | 6 -
old/Makefile | 182 -
old/README.API | 29 -
old/README.examples | 10 -
old/README.rst | 40 -
old/RFA.md | 101 -
old/TODO | 418 -
old/TODO.plgoons | 79 -
old/bin/ooni-probe | 10 -
old/keyword-lists/Makefile | 3 -
old/keyword-lists/keyfile | 256 -
old/list/list.txt | 2 -
old/ooni-probe.diff | 358 -
old/ooni/.DS_Store | Bin 15364 -> 0 bytes
old/ooni/__init__.py | 12 -
old/ooni/captive_portal.py | 62 -
old/ooni/command.py | 250 -
old/ooni/common.py | 139 -
old/ooni/dns_cc_check.py | 48 -
old/ooni/dns_poisoning.py | 43 -
old/ooni/dnsooni.py | 356 -
old/ooni/empty.txt | 9 -
old/ooni/helpers.py | 38 -
old/ooni/http.py | 306 -
old/ooni/input.py | 33 -
old/ooni/namecheck.py | 39 -
old/ooni/output.py | 21 -
old/ooni/plugins/captiveportal_plgoo.py | 55 -
old/ooni/plugins/dnstest_plgoo.py | 84 -
old/ooni/plugins/http_plgoo.py | 70 -
old/ooni/plugins/marco_plgoo.py | 377 -
old/ooni/plugins/netalyzr_plgoo.py | 30 -
old/ooni/plugins/old_stuff_to_convert/README | 47 -
.../plugins/old_stuff_to_convert/README.automation | 11 -
old/ooni/plugins/old_stuff_to_convert/TODO | 6 -
.../plugins/old_stuff_to_convert/cached-consensus |11724 --------------------
.../plugins/old_stuff_to_convert/connectback.sh | 56 -
.../plugins/old_stuff_to_convert/dirconntest.sh | 52 -
.../plugins/old_stuff_to_convert/dns-checker.sh | 7 -
.../old_stuff_to_convert/generic-host-test.sh | 33 -
old/ooni/plugins/old_stuff_to_convert/host-prep.sh | 20 -
.../plugins/old_stuff_to_convert/install-probe.sh | 27 -
old/ooni/plugins/old_stuff_to_convert/run-tests.sh | 11 -
.../plugins/old_stuff_to_convert/twitter-test.sh | 33 -
old/ooni/plugins/proxy_plgoo.py | 69 -
old/ooni/plugins/simple_dns_plgoo.py | 35 -
old/ooni/plugins/skel_plgoo.py | 17 -
old/ooni/plugins/skel_plgoo.yaml | 33 -
old/ooni/plugins/tcpcon_plgoo.py | 278 -
old/ooni/plugins/tor.py | 80 -
old/ooni/plugins/torrc | 9 -
old/ooni/plugooni.py | 106 -
old/ooni/report.py | 22 -
old/ooni/transparenthttp.py | 41 -
old/ooni/yamlooni.py | 40 -
old/proxy-lists/Makefile | 11 -
old/proxy-lists/README | 9 -
old/proxy-lists/italy-dns.txt | 46 -
old/proxy-lists/italy-http-block-pages-notes.txt | 62 -
old/proxy-lists/italy-http-block-pages.txt | 5 -
old/proxy-lists/parse-trusted-xff.sh | 16 -
old/proxy-lists/trusted-xff.html | 7789 -------------
old/reports/marco-1.yamlooni | 86 -
old/reports/marco-2.yamlooni | 60 -
old/reports/marco.log | 4672 --------
old/reports/marco.yamlooni | 241 -
old/reports/marco_certs-1-2.out | 307 -
old/reports/marco_certs-1.out | 5850 ----------
old/reports/marco_certs-2.out | 1182 --
old/reports/marco_certs.out | 1900 ----
old/setup.py | 10 -
old/spec/proxooni-spec.txt | 65 -
old/test-lists/Makefile | 7 -
old/tests/test_import.py | 10 -
old/third-party/Makefile | 3 -
old/third-party/README | 14 -
ooni-probe.conf | 77 -
ooni/__init__.py | 1 +
ooni/assets/bridgetests.txt | 3 +
ooni/assets/example.txt | 2 +
ooni/assets/tcpscan.txt | 2 +
ooni/config.py | 53 +
ooni/date.py | 11 +
ooni/lib/Makefile | 20 +
ooni/lib/__init__.py | 9 +
ooni/lib/txscapy.py | 363 +
ooni/log.py | 40 +
ooni/logo.py | 214 +
ooni/nodes.conf | 53 +
ooni/ooni-probe.conf | 77 +
ooni/ooniprobe.log | 1 +
ooni/ooniprobe.py | 125 +
ooni/oonitests/bridget.py | 373 +
ooni/oonitests/dnstamper.py | 156 +
ooni/oonitests/httphost.py | 135 +
ooni/oonitests/squid.py | 113 +
ooni/oonitests/tcpscan.py | 86 +
ooni/oonitests/template.py | 65 +
ooni/oonitests/traceroute.py | 110 +
ooni/plugins/__init__.py | 3 +
ooni/plugins/blocking.py | 41 +
ooni/plugins/bridget.py | 72 +
ooni/plugins/chinatrigger.py | 140 +
ooni/plugins/examplescapy.py | 49 +
ooni/plugins/httphost.py | 121 +
ooni/plugins/httpt.py | 40 +
ooni/plugins/skel.py | 29 +
ooni/plugins/tcpconnect.py | 62 +
ooni/plugoo/__init__.py | 47 +
ooni/plugoo/assets.py | 56 +
ooni/plugoo/interface.py | 23 +
ooni/plugoo/nodes.py | 180 +
ooni/plugoo/reports.py | 181 +
ooni/plugoo/tests.py | 81 +
ooni/plugoo/work.py | 198 +
ooni/protocols/http.py | 117 +
ooni/protocols/scapy.py | 55 +
ooni/scaffolding.py | 72 +
ooni/utils.py | 146 +
oonib/dnsbackend.py | 16 +
oonib/httpbackend.py | 74 +
oonib/oonibackend.py | 34 +
oonicli.py | 142 -
ooniprobe.py | 191 -
plugins/__init__.py | 3 -
plugins/dropin.cache | 48 -
plugins/skel.py | 20 -
plugoo/__init__.py | 80 -
plugoo/assets.py | 56 -
plugoo/interface.py | 2 -
plugoo/nodes.py | 180 -
plugoo/reports.py | 175 -
plugoo/tests.py | 213 -
plugoo/work.py | 162 -
skel.py | 10 -
tests/bridget.py | 378 -
tests/dnstamper.py | 156 -
tests/httphost.py | 135 -
tests/squid.py | 113 -
tests/tcpscan.py | 86 -
tests/template.py | 65 -
tests/test_tests.py | 44 +
tests/test_worker.py | 29 +
tests/traceroute.py | 110 -
unittest/tests.py | 27 -
utils.py | 146 -
249 files changed, 43058 insertions(+), 41970 deletions(-)
More information about the tor-commits
mailing list