commit 3a5dce31dc43f1ea7292e67372b57385ab5a4788 Merge: 94327eb 19c111c Author: Isis Lovecruft isis@torproject.org Date: Tue Jan 23 21:05:21 2018 +0000

Merge branch 'fix/24432' into develop

bridgedb/distributors/moat/server.py | 1 + scripts/externalize-pt-client | 12 +++++++++ scripts/test-moat | 49 ++++++++++++++++++++++++++++-------- 3 files changed, 52 insertions(+), 10 deletions(-)