[tor-commits] [bridgedb/master] Merge branch 'fix/9127-https-interface-ipv6' into develop

[isis at torproject.org]

commit 95dd010dd9ef9faf69e6034f952a7a95b6743c3b
Merge: a90e586 b57f054
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jan 28 19:30:20 2014 +0000

    Merge branch 'fix/9127-https-interface-ipv6' into develop

 lib/bridgedb/templates/base.html |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)