[tor-commits] [bridgedb/master] Merge branch 'fix/12505-5418-remove-old-block-code' into develop