[tor-commits] [ooni-probe/master] Merge pull request #354 from TheTorProject/fix/settings-config

[art at torproject.org]

commit 0df1fa8f77b68c1f8e126c265483f4edc893c61d
Merge: 11efacd b8d85bb
Author: Arturo Filastò <arturo at filasto.net>
Date:   Tue Oct 7 00:01:56 2014 +0200

    Merge pull request #354 from TheTorProject/fix/settings-config
    
    Make it possible to set the data directory via an environment variable O...

 ooni/settings.py           |   32 +++++++++++++++++++-------------
 ooni/tests/test_oonicli.py |    4 ++--
 2 files changed, 21 insertions(+), 15 deletions(-)