[tor-commits] [bridgedb/master] Merge branch 'task/33299' into develop

[phw at torproject.org]

commit eb12be54ef672bd874b7e85ea0ee5f8dc7282a96
Merge: 7f1638e 651e442
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Feb 18 16:05:23 2020 -0800

    Merge branch 'task/33299' into develop

 .travis.requirements.txt              |  1 +
 CHANGELOG                             |  3 +++
 bridgedb.conf                         |  6 +++---
 bridgedb/bridges.py                   |  7 +++----
 bridgedb/distributors/https/server.py |  5 +----
 bridgedb/distributors/moat/server.py  |  4 +---
 bridgedb/i18n/templates/bridgedb.pot  | 13 +++++--------
 bridgedb/test/test_https.py           | 27 ---------------------------
 8 files changed, 17 insertions(+), 49 deletions(-)