commit ee9a76d18c4328c3f3ce44ec62f166cf870d4003 Merge: 9b2a724 f128f46 Author: Isis Lovecruft isis@torproject.org Date: Wed Apr 22 01:25:42 2015 +0000

Merge branch 'fix/15866-broken-bridgeauth' into develop

bridgedb.conf | 20 +++++++++++++++++++- lib/bridgedb/Main.py | 17 +++++++++++++---- lib/bridgedb/bridges.py | 32 +++++++++++++++++++++++--------- lib/bridgedb/configure.py | 4 ++++ lib/bridgedb/test/test_bridges.py | 29 +++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 14 deletions(-)