commit 2dcdd44e2e7bb8c382290fef861cbcfbd0a8bcb9 Author: Isis Lovecruft isis@torproject.org Date: Wed Feb 5 22:02:27 2014 +0000

Fix encoding and safety catches for two logs of bridge IDs in Bridges.py. --- lib/bridgedb/Bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 2bfa288..6bf4b2e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1134,7 +1134,7 @@ class FilteredBridgeSplitter(BridgeHolder): if not bridge.running: logging.warn( "Skipping hashring insertion for non-running bridge: '%s'" - % bridge.getID()) + % Util.logSafely(bridge.fingerprint)) return

self.bridges.append(bridge) @@ -1142,7 +1142,7 @@ class FilteredBridgeSplitter(BridgeHolder): if filterFn(bridge): subring.insert(bridge) logging.debug("Inserted bridge '%s' into '%s' sub hashring" - % (bridge.getID(), ringname)) + % (Util.logSafely(bridge.fingerprint), ringname))

def extractFilterNames(self, ringname): """Get the names of the filters applied to a particular sub hashring.