[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket21871_01'