From 3b4a34ccb9458eebd41fc868a3d1894b1dc15a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 12 Jan 2023 22:11:14 +0100 Subject: [PATCH] Remove reused CHANGES entry Changes entry 6063 was added to the v9_18 branch (by commit cb3990001fb2ce978a44cc9d03b679cf626d03b1) without an associated placeholder in the main branch. The same entry number was subsequently reused for a different change in the main branch (by commit 41870dccbae3872154d5a6a76d70b5cb40d82c05). To prevent confusion, remove the entry from the v9_18 branch as the original code change whose reversal is mentioned in entry 6063 was not accompanied by its own CHANGES entry. --- CHANGES | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGES b/CHANGES index 995638ee04..102387f4ac 100644 --- a/CHANGES +++ b/CHANGES @@ -13,9 +13,6 @@ exceeded, and the XML and JSON statistics version numbers have been updated. (CVE-2022-3094) [GL #3523] -6063. [bug] Revert a change that limited to honour single - read for TLSDNS as it broke XoT. [GL #3772] - 6062. [func] The DSCP implementation, which has been nonfunctional for some time, is now marked as obsolete and the implementation has been removed.