Sync CHANGES [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901204 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 20d9e60a66b314f364afd4f79c81d71ba1103632..7cb9ff9e12a601b74ca9339c912599319ca02a86 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.54
 
+  *) ab: Allow for TLSv1.3 when the SSL library supports it.
+     [abhilash1232 gmail.com, xiaolongx.jiang intel.com, Yann Ylavic]
+
   *) core: Disable TCP_NOPUSH optimization on OSX since it might introduce
      transmission delays.  PR 66019.  [Yann Ylavic]
 

diff --git a/changes-entries/ab_tls13.txt b/changes-entries/ab_tls13.txt
deleted file mode 100644 (file)
index 3b6a00f..0000000
--- a/changes-entries/ab_tls13.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) ab: Allow for TLSv1.3 when the SSL library supports it.
-     [abhilash1232 gmail.com, xiaolongx.jiang intel.com, Yann Ylavic]