[tor-commits] [bridgedb/master] Merge branch 'fix/make-config.py' into develop

[isis at torproject.org]

commit 6ccf0c7f4b421ecca5273592892ba61def71df6b
Merge: bb0a743 d24f778
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Aug 27 08:45:50 2014 +0000

    Merge branch 'fix/make-config.py' into develop

 lib/bridgedb/Main.py                |  126 ++++-----------------------------
 lib/bridgedb/configure.py           |  132 +++++++++++++++++++++++++++++++++++
 lib/bridgedb/persistent.py          |   14 +---
 lib/bridgedb/test/test_configure.py |   67 ++++++++++++++++++
 4 files changed, 214 insertions(+), 125 deletions(-)