[tor-commits] [bridgedb/master] Merge branch 'feature/cleanup-config' into develop

[isis at torproject.org]

commit 8318b3e276c429a8d5a3b04d9fc20e4be3a4d757
Merge: 6764b9c 5f26b66
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Oct 29 05:45:28 2013 +0000

    Merge branch 'feature/cleanup-config' into develop

 bridgedb.conf |  268 +++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 185 insertions(+), 83 deletions(-)