commit 2fb54faf3b4e6c08270aba6daa4d212dc9328252 Merge: b705eae 08d6170 Author: Arturo Filastò hellais@users.noreply.github.com Date: Thu Apr 17 14:08:50 2014 +0200

Merge pull request #301 from olafmk/master

Fixes Issue 300 Endless recursion 'Configuration file does not exist'

HACKING | 10 +++++----- ooni/settings.py | 12 +++++++----- ooni/utils/log.py | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-)