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

9 Jan 2017


      commit ab51b841590e422d81fe6138929ec52c9fe1167c
Merge: 62b17e8 a09089c
Author: Isis Lovecruft <isis@torproject.org>
Date:   Mon Jan 9 19:59:05 2017 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org