Unverified Commit e6ac1cca authored by Isis Lovecruft's avatar Isis Lovecruft
Browse files

Merge branch 'release/0.6.6'

parents 9cfb4690 2a4ba64a
......@@ -280,6 +280,13 @@ class BridgeRing(object):
for fingerprint in fingerprints:
bridge = self.bridges[fingerprint]
jump = False
# HOTFIX for https://bugs.torproject.org/26150
if not bridge.address:
logging.error("Got strange bridge with no address field set: %s"
% fingerprint)
for subnet in subnets:
if bridge.address in subnet:
jump = True
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment