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

[isis@xxxxxxxxxxxxxx]

commit 63d56a8142b7dba4eb4eec3da8f3d40a67d1cf59
Merge: b4f20eb a580c4b
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Wed Aug 27 06:40:22 2014 +0000

    Merge commit 'a580c4ba0d30f55546d3d181d7ea878e6a13133c' into develop




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