[tor-commits] [ooni-probe/master] Merge pull request #341 from TheTorProject/feature/deckgen

[art at torproject.org]

commit 49849e525cfe26075593973cba7b6c03336b1ca8
Merge: 8c56b16 aeccb18
Author: aagbsn <aagbsn at extc.org>
Date:   Tue Sep 2 15:56:57 2014 +0000

    Merge pull request #341 from TheTorProject/feature/deckgen
    
    Feature/deckgen

 README.rst                                       |   91 ++++++++++--
 bin/oonideckgen                                  |   30 ++++
 bin/oonireport                                   |    3 +-
 bin/ooniresources                                |   27 ++++
 data/resources/README                            |    1 +
 ooni/deckgen/__init__.py                         |    1 +
 ooni/deckgen/cli.py                              |  166 ++++++++++++++++++++++
 ooni/deckgen/processors/citizenlab_test_lists.py |   52 +++++++
 ooni/deckgen/processors/namebench_dns_servers.py |   52 +++++++
 ooni/geoip.py                                    |   19 +--
 ooni/resources/__init__.py                       |   41 ++++++
 ooni/resources/cli.py                            |   55 +++++++
 ooni/resources/update.py                         |   39 +++++
 ooni/settings.py                                 |    1 +
 ooni/utils/__init__.py                           |   29 ++++
 setup.py                                         |    5 +-
 16 files changed, 591 insertions(+), 21 deletions(-)