commit 16e7a2d5fad1658244c204bdfb54e5e385e4632f Merge: a316083 77776de Author: Isis Lovecruft isis@torproject.org Date: Tue Nov 28 19:44:42 2017 +0000

Merge branch 'fix/24460' into develop

bridgedb/distributors/https/server.py | 6 ++++-- bridgedb/test/test_https_server.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-)