commit 50286fabe267e5c13992a57aa02181cfdca68945 Merge: c23cf00 a1d5c24 Author: Isis Lovecruft isis@torproject.org Date: Tue Mar 31 05:20:31 2015 +0000

Merge branch 'fix/4771-log-tor-exits_r1' into develop

lib/bridgedb/Dist.py | 54 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 16 deletions(-)