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