[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art at torproject.org]

commit 4e83a9c1345cb9b594156d901de489932037809c
Merge: 17e388a f4ba7f1
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Jan 20 11:27:48 2015 +0100

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Point the http header field manipulation test to a working backend
      Add support for Linux Mint
      Add install package libdumbnet-dev
      Add install of pyasn1 and pyasn1-modules to setup-dependencies script
      Remove unused reports_directory
      Skip calculating the version of the geoip files that are not found
      Ignore settings.ini
      Re-add manpages to manifest
      Use the new function for determining the geoip data files path
      Add to requirements.txt previously missing requirements
      Restructure directories where ooni software writes/reads from

 .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                            |   11 ++-
 setup.py                                         |   25 +++++-
 14 files changed, 141 insertions(+), 71 deletions(-)