commit eaedec23b264fe515ed116d690da1c5396f30198 Author: Isis Lovecruft isis@torproject.org Date: Mon Mar 30 01:13:11 2015 +0000

Log when we treat a client differently because they are using Tor.

* FIXES #4771: https://bugs.torproject.org/4771 --- lib/bridgedb/Dist.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index db71db3..961d2ca 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -289,13 +289,19 @@ class IPBasedDistributor(Distributor): # try to match the request to an ip category for category in self.categories: # IP Categories - if category.contains(ip): + if ip in category: + # The tag is a tag applied to a proxy IP address when it is + # added to the bridgedb.proxy.ProxySet. For Tor Exit relays, + # the default is 'exit_relay'. For other proxies loaded from + # the PROXY_LIST_FILES config option, the default tag is the + # full filename that the IP address originally came from. + tag = category.getTag(ip) + logging.info("Client was from known proxy (tag: %s): %s" % (tag, ip)) g = filterAssignBridgesToRing(self.splitter.hmac, self.nClusters + len(self.categories), n) bridgeFilterRules.append(g) - logging.info("category<%s>%s", epoch, logSafely(area)) pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring-%d" % n)