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

[isis at torproject.org]

commit 9a926f28de7af283558bf2688d5fa642d059c678
Merge: b828d57 9bb5de6
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Dec 13 20:12:17 2017 +0000

    Merge branch 'master' into develop

 bridgedb/distributors/moat/server.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)