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