[tor-commits] [ooni-probe/master] Merge pull request #582 from TheTorProject/v2.0.0-alpha

art at torproject.org art at torproject.org
Mon Sep 19 12:14:25 UTC 2016


commit 7d5f430becd2372d71c8e5839d32244121dbbe80
Merge: da00195 b6b03ac
Author: Simone Basso <bassosimone at gmail.com>
Date:   Mon Sep 19 13:56:08 2016 +0200

    Merge pull request #582 from TheTorProject/v2.0.0-alpha
    
    V2.0.0 alpha

 .coveragerc                                        |     2 +-
 .gitignore                                         |     4 +
 ChangeLog.rst                                      |    18 +
 MANIFEST.in                                        |     8 +-
 Vagrantfile                                        |    33 +-
 bin/Makefile                                       |    81 -
 bin/oonid                                          |     7 -
 bin/oonideckgen                                    |    37 -
 bin/ooniprobe                                      |    24 -
 bin/ooniprobe-dev                                  |    10 -
 bin/oonireport                                     |    38 -
 bin/ooniresources                                  |    35 -
 bin/test/ooni/__init__.py                          |     1 -
 data/configs/lepidopter-ooniprobe.conf             |    75 -
 data/configs/lepidopter-oonireport.conf            |    69 -
 data/decks/complete.deck                           |    72 -
 data/decks/complete_no_root.deck                   |    60 -
 data/decks/fast.deck                               |    36 -
 data/decks/fast_no_root.deck                       |    24 -
 data/decks/mlab.deck                               |    12 -
 data/decks/web-full.yaml                           |    23 +
 data/decks/web-no-invalid.yaml                     |    18 +
 data/inputs/.gitignore                             |     2 -
 data/lepidopter-update.py                          |   385 +
 data/ooniprobe.conf.sample                         |     7 +-
 data/resources/README                              |     2 -
 data/ui/.bowerrc                                   |     5 -
 data/ui/app/index.html                             |    39 -
 data/ui/app/libs/angular-resource/README.md        |     4 -
 .../app/libs/angular-resource/angular-resource.js  |   445 -
 data/ui/app/libs/angular-resource/component.json   |    17 -
 data/ui/app/libs/angular/angular.js                | 14733 -------------------
 data/ui/app/libs/angular/component.json            |    14 -
 data/ui/app/libs/bootstrap/component.json          |     9 -
 .../libs/bootstrap/css/bootstrap-responsive.css    |  1109 --
 data/ui/app/libs/bootstrap/css/bootstrap.css       |  6158 --------
 .../bootstrap/img/glyphicons-halflings-white.png   |   Bin 8777 -> 0 bytes
 .../libs/bootstrap/img/glyphicons-halflings.png    |   Bin 12799 -> 0 bytes
 data/ui/app/libs/bootstrap/js/bootstrap.js         |  2276 ---
 data/ui/app/libs/jquery/component.json             |    14 -
 data/ui/app/libs/jquery/composer.json              |    23 -
 data/ui/app/libs/jquery/jquery.js                  |  9472 ------------
 data/ui/app/libs/ng-upload/component.json          |    23 -
 data/ui/app/libs/ng-upload/ng-upload.js            |   107 -
 data/ui/app/scripts/app.js                         |    30 -
 data/ui/app/scripts/controllers.js                 |    96 -
 data/ui/app/scripts/directives.js                  |     5 -
 data/ui/app/scripts/filters.js                     |     5 -
 data/ui/app/scripts/services.js                    |    27 -
 data/ui/app/styles/app.css                         |    21 -
 data/ui/app/views/inputs.html                      |    31 -
 data/ui/app/views/settings.html                    |     0
 data/ui/app/views/sidebar.html                     |    10 -
 data/ui/app/views/test.html                        |    48 -
 data/ui/component.json                             |     9 -
 ooni/__init__.py                                   |    13 +-
 ooni/agent/__init__.py                             |     0
 ooni/agent/agent.py                                |    28 +
 ooni/agent/scheduler.py                            |   432 +
 ooni/api/__init__.py                               |     0
 ooni/api/spec.py                                   |   253 -
 ooni/backend_client.py                             |   117 +-
 ooni/constants.py                                  |     4 +-
 ooni/contrib/__init__.py                           |     1 +
 ooni/contrib/croniter.py                           |   430 +
 ooni/contrib/dateutil/__init__.py                  |     0
 ooni/contrib/dateutil/relativedelta.py             |   539 +
 ooni/contrib/dateutil/tz/__init__.py               |     4 +
 ooni/contrib/dateutil/tz/_common.py                |   100 +
 ooni/contrib/dateutil/tz/tz.py                     |  1339 ++
 ooni/contrib/dateutil/tz/win.py                    |   354 +
 ooni/deck.py                                       |   413 -
 ooni/deck/__init__.py                              |     1 +
 ooni/deck/backend.py                               |   191 +
 ooni/deck/deck.py                                  |   411 +
 ooni/deck/legacy.py                                |    65 +
 ooni/deck/store.py                                 |   198 +
 ooni/deckgen/__init__.py                           |     1 -
 ooni/deckgen/cli.py                                |   179 -
 ooni/deckgen/processors/__init__.py                |     0
 ooni/deckgen/processors/citizenlab_test_lists.py   |    55 -
 ooni/deckgen/processors/namebench_dns_servers.py   |    51 -
 ooni/director.py                                   |   233 +-
 ooni/geoip.py                                      |    82 +-
 ooni/measurements.py                               |   133 +
 ooni/nettest.py                                    |   122 +-
 ooni/nettests/blocking/web_connectivity.py         |    14 +-
 .../manipulation/http_invalid_request_line.py      |    14 +-
 ooni/nodes.conf                                    |    53 -
 ooni/oonicli.py                                    |   520 -
 ooni/oonid.py                                      |    15 -
 ooni/otime.py                                      |     7 +
 ooni/report/__init__.py                            |     1 -
 ooni/report/cli.py                                 |    90 -
 ooni/report/parser.py                              |    35 -
 ooni/report/tool.py                                |   117 -
 ooni/reporter.py                                   |   427 +-
 ooni/resources.py                                  |   177 +
 ooni/resources/__init__.py                         |     7 -
 ooni/resources/cli.py                              |    44 -
 ooni/resources/update.py                           |    57 -
 ooni/scripts/__init__.py                           |     0
 ooni/scripts/oonideckgen.py                        |   131 +
 ooni/scripts/ooniprobe.py                          |    37 +
 ooni/scripts/ooniprobe_agent.py                    |   220 +
 ooni/scripts/oonireport.py                         |   308 +
 ooni/scripts/ooniresources.py                      |    36 +
 ooni/settings.py                                   |   427 +-
 ooni/tasks.py                                      |     4 +-
 ooni/templates/httpt.py                            |     9 +-
 ooni/templates/process.py                          |     7 +-
 ooni/templates/tcpt.py                             |     1 -
 ooni/tests/__init__.py                             |     7 -
 ooni/tests/bases.py                                |     4 +-
 ooni/tests/mocks.py                                |     2 +-
 ooni/tests/test_backend_client.py                  |    16 -
 ooni/tests/test_deck.py                            |   279 +-
 ooni/tests/test_director.py                        |    17 +-
 ooni/tests/test_geoip.py                           |    18 +-
 ooni/tests/test_nettest.py                         |    24 +-
 ooni/tests/test_oonicli.py                         |    49 +-
 ooni/tests/test_oonideckgen.py                     |    37 +
 ooni/tests/test_oonireport.py                      |    72 +-
 ooni/tests/test_reporter.py                        |    89 +-
 ooni/tests/test_resources.py                       |    56 +
 ooni/tests/test_scheduler.py                       |    77 +
 ooni/tests/test_settings.py                        |    67 +
 ooni/tests/test_socks.py                           |    10 +
 ooni/tests/test_txscapy.py                         |     3 -
 ooni/tests/test_utils.py                           |    42 +-
 ooni/tests/test_wui_server.py                      |    32 +
 ooni/ui/__init__.py                                |     0
 ooni/ui/cli.py                                     |   555 +
 ooni/ui/consent-form.md                            |   265 +
 ooni/ui/web/__init__.py                            |     0
 ooni/ui/web/client/index.html                      |    17 +
 ooni/ui/web/server.py                              |   610 +
 ooni/ui/web/web.py                                 |    29 +
 ooni/utils/__init__.py                             |    77 +-
 ooni/utils/files.py                                |    34 +
 ooni/utils/log.py                                  |   175 +-
 ooni/utils/onion.py                                |    80 +-
 ooni/utils/txscapy.py                              |    73 +-
 requirements.txt                                   |     1 +
 scripts/__init__.py                                |     0
 scripts/set_caps/Makefile                          |    81 +
 scripts/set_caps/__init__.py                       |     0
 scripts/set_caps/test/__init__.py                  |     0
 scripts/set_caps/test/ooni/__init__.py             |     1 +
 scripts/systemd/ooniprobe.service                  |    15 +
 setup.py                                           |   429 +-
 151 files changed, 9232 insertions(+), 38431 deletions(-)





More information about the tor-commits mailing list