aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-03-16 10:45:00 +0100
committerIngela Anderton Andin <[email protected]>2018-03-16 10:45:00 +0100
commitbdbb5f0376678c0aae289b3f9264a2bd4d9b96ee (patch)
treee7da8f2ba00ee881a540845d6e98f042a9454400 /lib/ssl/vsn.mk
parent845dd68493a91decc32d50cc785e6afaf9dfb6c3 (diff)
parent0f2ead7bedeedc852db2deeeaa0e9e096bba8c0f (diff)
downloadotp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.tar.gz
otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.tar.bz2
otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes ssl: Prepare for release ssl: Remove duplicate release note ssl: Fix filter function to not discard AEAD cipher suites Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssl/vsn.mk')
-rw-r--r--lib/ssl/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 2ece6ef2d5..0ff22c5eab 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.2.4
+SSL_VSN = 8.2.5