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

20 Dec 2017


      commit 05ca3dbd35a392e8661c7288dc42c99a3443b110
Merge: 6ace9a3 2ae288d
Author: Isis Lovecruft <isis@torproject.org>
Date:   Wed Dec 20 23:07:24 2017 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org