[tor-commits] [ooni-probe/master] Merge pull request #372 from TheTorProject/fix/14086

[art@xxxxxxxxxxxxxx]

commit 2ff381e5276fef1fdd203fc0662aebd6957a113d
Merge: a609558 8330d9f
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Thu Jan 15 14:58:30 2015 +0100

    Merge pull request #372 from TheTorProject/fix/14086
    
    Fix/14086

 .gitignore                                       |    2 +
 MANIFEST.in                                      |    4 +
 data/ooniprobe.conf.sample                       |    2 -
 ooni/deckgen/cli.py                              |    4 +-
 ooni/deckgen/processors/citizenlab_test_lists.py |   16 ++--
 ooni/deckgen/processors/namebench_dns_servers.py |    8 +-
 ooni/geoip.py                                    |   14 ++--
 ooni/resources/__init__.py                       |   24 ++++--
 ooni/resources/update.py                         |    5 +-
 ooni/settings.py                                 |   91 +++++++++++++++-------
 ooni/tests/test_oonicli.py                       |    2 +-
 requirements.txt                                 |    4 +
 setup-dependencies.sh                            |    2 +
 setup.py                                         |   25 +++++-
 14 files changed, 133 insertions(+), 70 deletions(-)



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