aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-07-10 10:11:18 +0200
committerJohn Högberg <[email protected]>2019-07-10 10:11:18 +0200
commit0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56 (patch)
treebc2fd46c12b1f07ea73f02fad93102a1cf67a2d5 /lib/ssl
parentbb4955e083e34be40a9e0d5c0831e5b1498d11df (diff)
parent4e9792256a754ff10f6a214f582fbb58e081deb2 (diff)
downloadotp-0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56.tar.gz
otp-0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56.tar.bz2
otp-0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/notes.xml16
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index c7a0942932..a40aca658a 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,22 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
+<section><title>SSL 9.3.5</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Enhance error handling for erroneous alerts from the
+ peer.</p>
+ <p>
+ Own Id: OTP-15943</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 9.3.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index df38aea017..c9547cae36 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.3.4
+SSL_VSN = 9.3.5