[tor-commits] [ooni-probe/master] Merge pull request #366 from TheTorProject/fix/setup.py

Sat Jan 3 15:05:13 UTC 2015

commit 3977a879d2685e5a99fec6e7de0ad475a376c071
Merge: 5c9bb4d bdb7896
Author: Arturo FilastÃ² <arturo at filasto.net>
Date:   Thu Nov 20 16:00:41 2014 +0100

    Merge pull request #366 from TheTorProject/fix/setup.py
    
    Fix/setup.py

 MANIFEST.in                |    1 +
 data/ooniprobe.conf.sample |    2 +-
 ooni/deckgen/cli.py        |    1 +
 ooni/resources/__init__.py |   12 ++++-
 ooni/resources/update.py   |    7 ++-
 ooni/settings.py           |   43 ++++++++--------
 ooni/utils/__init__.py     |    7 ++-
 requirements.txt           |    1 +
 setup.py                   |  122 +++++++++++++++++++++-----------------------
 9 files changed, 106 insertions(+), 90 deletions(-)