[tor-commits] [bridgedb/master] Merge branch 'master' into develop

[isis]

commit 926a9899c1a1f18649838c857291d4e6daaff746
Merge: f1267fc f2fe8fb
Author: Isis Lovecruft <i...@torproject.org>
Date:   Mon Aug 8 15:23:04 2016 +0000

    Merge branch 'master' into develop




_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits