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

[isis at torproject.org]

commit c6c9f47968368f987dd0b9edefdf55ea4f0b1ad2
Merge: 637e1fc 0f03fb6
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Dec 22 03:20:32 2017 +0000

    Merge branch 'fix/24701' into develop

 bridgedb/distributors/https/server.py | 43 +++++++++++++++++++++++++++--------
 bridgedb/test/test_https_server.py    | 11 ++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)