commit 96707e2f0d3c76d23549be236f7d56a22f23f84b Merge: 9de0976 48d4562 Author: Isis Lovecruft isis@torproject.org Date: Sat Oct 28 00:18:22 2017 +0000

Merge branch 'feature/23957' into develop

.test.requirements.txt | 2 +- .travis.requirements.txt | 4 +-- bridgedb/Bridges.py | 65 +++++++++++++++++++++++++++++----------- bridgedb/Storage.py | 24 +++++++++++++++ bridgedb/bridges.py | 10 +++++++ bridgedb/test/test_Storage.py | 69 +++++++++++++++++++++++++++++++++++++++---- requirements.txt | 2 +- 7 files changed, 150 insertions(+), 26 deletions(-)