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

[phw at torproject.org]

commit bca64964a255cf959489c7049c66e5eb70b5291c
Merge: 7afbe7e 1958bbb
Author: Philipp Winter <phw at nymity.ch>
Date:   Mon Apr 6 15:30:12 2020 -0700

    Merge branch 'defect/30941' into develop

 CHANGELOG                                    |   6 ++
 bridgedb/distributors/email/autoresponder.py |  10 --
 bridgedb/distributors/email/distributor.py   |   6 +-
 bridgedb/distributors/email/request.py       |  20 ++--
 bridgedb/distributors/email/templates.py     | 126 +++++------------------
 bridgedb/i18n/templates/bridgedb.pot         | 143 +++++++++++----------------
 bridgedb/metrics.py                          |   7 +-
 bridgedb/strings.py                          |  49 ++++-----
 bridgedb/test/test_email_autoresponder.py    |   5 +-
 bridgedb/test/test_email_request.py          |  46 ++++-----
 bridgedb/test/test_email_templates.py        |  41 +-------
 11 files changed, 151 insertions(+), 308 deletions(-)