commit 0341b7253eb76feb7f9fccd4b73572b270902fed Merge: 83e84d1 c91def0 Author: Isis Lovecruft isis@torproject.org Date: Tue Mar 31 23:23:21 2015 +0000

Merge branch 'fix/15522-ipv6-enumeration' into develop

lib/bridgedb/Dist.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)