commit 091e45ec7e4000806fb9877ce0ef681977b83352 Merge: 46f955f 2f76520 Author: aagbsn aagbsn@extc.org Date: Tue Mar 19 19:51:07 2013 -0700

Merge pull request #70 from isislovecruft/fix/director-unknown-cmdlineoptions

Fix/director unknown cmdlineoptions

ooni/config.py | 61 ++++++++++++++++++++++++++++++++++-------------- ooni/director.py | 2 +- ooniprobe.conf.sample | 4 ++- 3 files changed, 47 insertions(+), 20 deletions(-)