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

[phw at torproject.org]

commit 7f1638e1db2a36507f80b6d923baf1f62a7c4491
Merge: 74d1ec7 ae0c4eb
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Feb 4 11:28:50 2020 -0800

    Merge branch 'master' into develop

 .test.requirements.txt   |  6 +++---
 .travis.requirements.txt | 20 ++++++++++----------
 CHANGELOG                |  2 +-
 requirements.txt         | 16 ++++++++--------
 4 files changed, 22 insertions(+), 22 deletions(-)