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

1 Dec 2015


      commit c7d9cc4978f008fe657dd88653975248066dd1f6
Merge: 7931067 7d6defe
Author: Isis Lovecruft <isis@torproject.org>
Date:   Tue Dec 1 02:45:11 2015 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org