[tor-commits] [bridgedb/develop] Merge branch 'release-0.10.0'

[phw at torproject.org]

commit 2ccf7ef9dee07c0d645a5dfed5b099678c243fc5
Merge: 9a7ae57 f9a9a9c
Author: Philipp Winter <phw at nymity.ch>
Date:   Wed Apr 1 14:49:28 2020 -0700

    Merge branch 'release-0.10.0'

 .travis.requirements.txt                           |   2 +-
 CHANGELOG                                          |  22 +++
 README.rst                                         |  28 ++--
 bridgedb/Bridges.py                                | 178 +++++++++++----------
 bridgedb/Storage.py                                |  29 ++--
 bridgedb/captcha.py                                |   2 +-
 bridgedb/distributors/email/templates.py           |   9 +-
 bridgedb/distributors/https/server.py              |  13 +-
 bridgedb/distributors/https/templates/base.html    |   4 +-
 bridgedb/distributors/https/templates/bridges.html |  20 +--
 bridgedb/distributors/https/templates/howto.html   |  20 +--
 bridgedb/distributors/https/templates/info.html    |  40 +++++
 bridgedb/i18n/templates/bridgedb.pot               | 153 ++++++++++++------
 bridgedb/strings.py                                |  68 +++++---
 bridgedb/test/test_Bridges.py                      | 176 +++++++++++++++-----
 bridgedb/test/test_Storage.py                      |   2 +-
 bridgedb/test/test_https_server.py                 |   8 +-
 requirements.txt                                   |   2 +-
 18 files changed, 511 insertions(+), 265 deletions(-)