[tor-commits] [bridgedb/master] Merge branch 'defect/33631' into develop

[phw at torproject.org]

commit f015596ed72131293207b29088ba0391477a6c00
Merge: 4844220 43e931f
Author: Philipp Winter <phw at nymity.ch>
Date:   Wed Apr 1 14:34:07 2020 -0700

    Merge branch 'defect/33631' into develop

 .travis.requirements.txt      |   2 +-
 CHANGELOG                     |   7 ++
 bridgedb/Bridges.py           | 178 +++++++++++++++++++++---------------------
 bridgedb/Storage.py           |  29 +++----
 bridgedb/test/test_Bridges.py | 176 ++++++++++++++++++++++++++++++++---------
 bridgedb/test/test_Storage.py |   2 +-
 requirements.txt              |   2 +-
 7 files changed, 251 insertions(+), 145 deletions(-)