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

[phw at torproject.org]

commit ae0c4eb80047735ff6e7498309332d8d497e37f9
Merge: 5bded87 ce1dfca
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Feb 4 11:26:57 2020 -0800

    Merge branch 'release-0.9.2'

 .test.requirements.txt                          |  6 +--
 .travis.requirements.txt                        | 20 ++++-----
 AUTHORS                                         |  1 +
 CHANGELOG                                       |  7 +++
 README.rst                                      |  5 +--
 bridgedb/distributors/https/templates/base.html |  4 +-
 bridgedb/i18n/templates/bridgedb.pot            | 60 +++++++++++++------------
 bridgedb/strings.py                             |  8 ++--
 doc/HACKING.md                                  |  3 +-
 requirements.txt                                | 16 +++----
 scripts/create_descriptors                      |  4 ++
 11 files changed, 76 insertions(+), 58 deletions(-)