[tor-commits] [torspec/master] Merge remote-tracking branch 'arma/ticket23637-spec'