[tor-commits] [bridgedb/master] Merge branch 'fix/14065-vanilla-ipv6' into develop

[isis at torproject.org]

commit 481d36868e8c1e5a430b82ccd1d17ecfb0ed0837
Merge: 332ca3f 0449560
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Mar 23 01:52:38 2015 +0000

    Merge branch 'fix/14065-vanilla-ipv6' into develop

 lib/bridgedb/bridgerequest.py   |    4 ++--
 lib/bridgedb/bridges.py         |    4 +++-
 lib/bridgedb/test/test_https.py |   23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)