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

[isis]

commit fb309152cc2db7ce49e2e104f3a8e20c54a47a8b
Merge: 936958a 908294f
Author: Isis Lovecruft <i...@torproject.org>
Date:   Thu Jul 28 16:38:15 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