commit 5afd164ba046173e23a6c7be57a3183b41243cf1 Merge: 580222d a1f0e51 Author: Philipp Winter <phw@nymity.ch> Date: Tue Mar 24 09:40:57 2020 -0700 Merge branch 'defect/31967' into develop CHANGELOG | 3 +++ bridgedb/captcha.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)