[tor-commits] [bridgedb/develop] Merge branch 'fix/24704' into develop

[isis at torproject.org]

commit 637e1fc2a4e09ec8ad5a2442db2298d3666897eb
Merge: 1096bf4 ad26965
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Dec 22 02:41:46 2017 +0000

    Merge branch 'fix/24704' into develop

 bridgedb/Bridges.py                        | 52 ++++++++++++++++++++----
 bridgedb/distributors/email/distributor.py |  2 +-
 bridgedb/distributors/https/distributor.py |  2 +-
 bridgedb/test/test_Bridges.py              | 64 ++++++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 9 deletions(-)