commit 76d3c5bca779c78236a8dffb389304412e97af5e
Merge: 8245b6a a1597da
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Nov 27 19:38:27 2017 +0000
    Merge branch 'fix/24433' into develop
 bridgedb/bridgerequest.py | 2 +-
 scripts/test-moat         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)