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

21 May 2018


      commit 5ca53926d4bf32fe2cdd2ae3f2dba9e7a6f91b4e
Merge: ac7df7f 8a74291
Author: Isis Lovecruft <isis@torproject.org>
Date:   Mon May 21 18:59:51 2018 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org