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

[phw at torproject.org]

commit 7b142b899766dea9c503fa3bdf999421ee4b7f37
Merge: eb12be5 0f2349d
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Feb 18 16:15:44 2020 -0800

    Merge branch 'master' into develop

 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)