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

[isis]

commit c7d9cc4978f008fe657dd88653975248066dd1f6
Merge: 7931067 7d6defe
Author: Isis Lovecruft <i...@torproject.org>
Date:   Tue Dec 1 02:45:11 2015 +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