[tor-commits] [bridgedb/master] Merge branch 'fix/12843-cc-spurning_r2' into develop

[isis at torproject.org]

commit 689b50aa4ad41efe1f7f54983239aaee16ed602e
Merge: 9686f05 2033d83
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Feb 22 00:59:21 2015 +0000

    Merge branch 'fix/12843-cc-spurning_r2' into develop

 bridgedb.conf                  |   11 +-
 lib/bridgedb/Main.py           |   15 +-
 lib/bridgedb/configure.py      |    2 +-
 lib/bridgedb/test/test_Main.py |  429 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 451 insertions(+), 6 deletions(-)