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