commit 54c662947fb86330ef4a160a0e9fe2c707bd560c
Merge: d49e904 4faecd5
Author: Isis Lovecruft <i...@torproject.org>
Date:   Tue Feb 13 22:24:25 2018 +0000

    Merge branch 'release/0.6.4'

 bridgedb.conf                                  |  5 +++
 bridgedb/distributors/common/http.py           | 24 ++++++++++---
 bridgedb/distributors/moat/server.py           | 50 +++++++++++++++++---------
 bridgedb/parse/addr.py                         | 22 ++++++++++++
 bridgedb/test/moat_helpers.py                  |  3 ++
 bridgedb/test/test_distributors_common_http.py | 18 ++++++++++
 bridgedb/test/test_distributors_moat_server.py | 23 ++++++------
 7 files changed, 112 insertions(+), 33 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to