[tor-commits] [bridgedb/master] Merge branch 'fix/24432-ignore-loopback' into develop

[isis at torproject.org]

commit 4faecd5c7252d108e3749a63ab0f0a0464adec05
Merge: 8b4f736 bf7ec9e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Feb 13 22:20:51 2018 +0000

    Merge branch 'fix/24432-ignore-loopback' into develop

 bridgedb.conf                                  |  5 ++++
 bridgedb/distributors/common/http.py           | 24 +++++++++++++----
 bridgedb/distributors/moat/server.py           | 36 +++++++++++++++++++-------
 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 |  1 +
 7 files changed, 94 insertions(+), 15 deletions(-)