Merge branch 'maint-24' into maint

* maint-24:
  Updated OTP version
  Prepare release
  Update copyright year

4 files changed, 63 insertions, 2 deletions

diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 9649fca0f6..a490b41ac7 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -178,6 +178,44 @@
 
 </section>
 
+<section><title>SSL 10.7.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With this change, value of cacertfile option will be
+	    adjusted before loading certs from the file. Adjustments
+	    include converting relative paths to absolute and
+	    converting symlinks to actual file path.</p>
+          <p>
+	    Thanks to Marcus Johansson</p>
+          <p>
+	    Own Id: OTP-18099 Aux Id: PR-6287 </p>
+        </item>
+        <item>
+          <p>
+	    Incorrect handling of client middlebox negotiation for
+	    TLS-1.3 could result in that a TLS-1.3 server would not
+	    use middlebox mode although the client was expecting it
+	    too and failing the negotiation with unexpected message.</p>
+          <p>
+	    Own Id: OTP-18219 Aux Id: GH-6241, PR-6249 </p>
+        </item>
+        <item>
+          <p>
+	    If the "User" process, the process starting the TLS
+	    connection, gets killed in the middle of spawning the
+	    dynamic connection tree make sure we do not leave any
+	    processes behind.</p>
+          <p>
+	    Own Id: OTP-18233 Aux Id: GH-6244, PR-6270 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.7.3.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/src/ssl_pem_cache.erl b/lib/ssl/src/ssl_pem_cache.erl
index 9b8505fc3d..cc1c04da9a 100644
--- a/lib/ssl/src/ssl_pem_cache.erl
+++ b/lib/ssl/src/ssl_pem_cache.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 20016-2021. All Rights Reserved.
+%% Copyright Ericsson AB 20016-2022. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/tls_1_3_version_SUITE.erl b/lib/ssl/test/tls_1_3_version_SUITE.erl
index 15107b2223..8a3ff288f7 100644
--- a/lib/ssl/test/tls_1_3_version_SUITE.erl
+++ b/lib/ssl/test/tls_1_3_version_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2019-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2022. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index cb0614324b..c28a1317a7 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -454,6 +454,29 @@
 
 </section>
 
+<section><title>STDLIB 3.17.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>When changing callback module in <c>gen_statem</c> the
+	    state_enter calls flag from the old module was used in
+	    for the first event in the new module, which could
+	    confuse the new module and cause malfunction. This bug
+	    has been corrected. </p><p> With this change some
+	    <c>sys</c> debug message formats have been modified,
+	    which can be a problem for debug code relying on the
+	    format. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-18239</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.17.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>