Merge branch 'maint' into master

* maint:
  Updated OTP version
  Prepare release

6 files changed, 36 insertions, 55 deletions

diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 6a295d4383..6a40990d7d 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 4.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>There could be spurious warnings for unknown types
+	    when a type was a subtype of an existing type that was a
+	    subtype of an unknown type.</p>
+          <p>
+	    Own Id: OTP-17963 Aux Id: GH-5764 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 4.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index f392cb763c..fc10b86d46 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 4.4.3
+DIALYZER_VSN = 4.4.4
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 2f4453598e..a2fd3c07d8 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,23 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.7.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Client certification could fail for TLS-1.3 servers that
+	    did not include the certificate_authorities extension in
+	    its certificate request message.</p>
+          <p>
+	    Own Id: OTP-17971 Aux Id: GH-5783 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 00b5177e97..0fb850b119 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.7
+SSL_VSN = 10.7.1
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index 9b051a1bcd..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1,53 +0,0 @@
-OTP-15719
-OTP-16559
-OTP-16607
-OTP-17455
-OTP-17656
-OTP-17718
-OTP-17759
-OTP-17800
-OTP-17812
-OTP-17815
-OTP-17816
-OTP-17822
-OTP-17828
-OTP-17830
-OTP-17833
-OTP-17838
-OTP-17839
-OTP-17840
-OTP-17843
-OTP-17847
-OTP-17851
-OTP-17852
-OTP-17854
-OTP-17857
-OTP-17865
-OTP-17868
-OTP-17872
-OTP-17877
-OTP-17880
-OTP-17883
-OTP-17886
-OTP-17887
-OTP-17888
-OTP-17891
-OTP-17893
-OTP-17895
-OTP-17900
-OTP-17902
-OTP-17903
-OTP-17904
-OTP-17905
-OTP-17907
-OTP-17912
-OTP-17918
-OTP-17924
-OTP-17928
-OTP-17929
-OTP-17931
-OTP-17941
-OTP-17942
-OTP-17947
-OTP-17959
-OTP-17962
diff --git a/otp_versions.table b/otp_versions.table
index 2efed80e91..b38857b332 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-24.3.1 : dialyzer-4.4.4 ssl-10.7.1 # asn1-5.0.18 common_test-1.22.1 compiler-8.1 crypto-5.0.6 debugger-5.2.1 diameter-2.2.5 edoc-1.1 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2 erts-12.3 et-1.6.5 eunit-2.7 ftp-1.1 inets-7.5.2 jinterface-1.12.2 kernel-8.3 megaco-4.3 mnesia-4.20.2 observer-2.11 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.12 reltool-0.9 runtime_tools-1.18 sasl-4.1.2 snmp-5.12 ssh-4.13.2 stdlib-3.17.1 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.2 xmerl-1.3.28 :
 OTP-24.3 : asn1-5.0.18 common_test-1.22.1 compiler-8.1 crypto-5.0.6 debugger-5.2.1 diameter-2.2.5 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2 erts-12.3 inets-7.5.2 jinterface-1.12.2 kernel-8.3 megaco-4.3 mnesia-4.20.2 observer-2.11 public_key-1.12 runtime_tools-1.18 sasl-4.1.2 snmp-5.12 ssh-4.13.2 ssl-10.7 stdlib-3.17.1 wx-2.1.2 # dialyzer-4.4.3 edoc-1.1 et-1.6.5 eunit-2.7 ftp-1.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 reltool-0.9 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 xmerl-1.3.28 :
 OTP-24.2.2 : inets-7.5.1 ssh-4.13.1 # asn1-5.0.17 common_test-1.22 compiler-8.0.4 crypto-5.0.5 debugger-5.2 dialyzer-4.4.3 diameter-2.2.4 edoc-1.1 eldap-1.2.9 erl_docgen-1.2 erl_interface-5.1 erts-12.2.1 et-1.6.5 eunit-2.7 ftp-1.1 jinterface-1.12.1 kernel-8.2 megaco-4.2 mnesia-4.20.1 observer-2.10.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 sasl-4.1.1 snmp-5.11 ssl-10.6.1 stdlib-3.17 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.1 xmerl-1.3.28 :
 OTP-24.2.1 : erts-12.2.1 ssl-10.6.1 # asn1-5.0.17 common_test-1.22 compiler-8.0.4 crypto-5.0.5 debugger-5.2 dialyzer-4.4.3 diameter-2.2.4 edoc-1.1 eldap-1.2.9 erl_docgen-1.2 erl_interface-5.1 et-1.6.5 eunit-2.7 ftp-1.1 inets-7.5 jinterface-1.12.1 kernel-8.2 megaco-4.2 mnesia-4.20.1 observer-2.10.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 sasl-4.1.1 snmp-5.11 ssh-4.13 stdlib-3.17 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.1 xmerl-1.3.28 :