[tor-commits] [bridgedb/master] Merge branch 'release-0.7.1'

[phw at torproject.org]

commit 2d86ae0c232a0390bbd891d42e9722a10589fd0e
Merge: a0644df 6e7523b
Author: Philipp Winter <phw at nymity.ch>
Date:   Fri Jun 7 10:23:40 2019 -0700

    Merge branch 'release-0.7.1'

 CHANGELOG                                       | 13 ++++++++++++-
 README.rst                                      |  7 +++----
 bridgedb.conf                                   |  3 +--
 bridgedb/distributors/https/templates/base.html |  3 +--
 bridgedb/strings.py                             |  2 +-
 bridgedb/test/test_email_autoresponder.py       |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)