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

13 Feb 2018


      commit c970e64636be52adfcd10db58549859ff6592313
Merge: 4faecd5 54c6629
Author: Isis Lovecruft <isis@torproject.org>
Date:   Tue Feb 13 22:24:33 2018 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org