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