[tor-commits] [bridgedb/master] Merge branch 'fix/29484' into develop

[phw at torproject.org]

commit 53bcb77571c7a1f6c60bef44fefb1ef39cd65c7f
Merge: 44d6ed3 edf27d1
Author: Philipp Winter <phw at nymity.ch>
Date:   Thu Oct 3 15:34:57 2019 -0700

    Merge branch 'fix/29484' into develop

 .test.requirements.txt                | 12 +++++-------
 .travis.requirements.txt              | 31 ++++++++++++++++---------------
 .travis.yml                           | 28 ++--------------------------
 CHANGELOG                             |  6 ++++++
 Makefile                              |  2 +-
 bridgedb/distributors/email/server.py |  3 ++-
 bridgedb/distributors/https/server.py |  2 +-
 bridgedb/test/test_crypto.py          |  2 +-
 bridgedb/test/test_email_dkim.py      |  2 +-
 bridgedb/test/test_email_server.py    |  2 +-
 bridgedb/test/test_persistent.py      |  8 ++++----
 bridgedb/translations.py              |  2 +-
 doc/HACKING.md                        | 17 +++++++++++++++++
 requirements.txt                      | 26 +++++++++++++-------------
 scripts/install-dependencies          |  5 ++---
 15 files changed, 73 insertions(+), 75 deletions(-)