Prepare release

8 files changed, 70 insertions, 8 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index d6bd0f50ea..dbf2b2b7a0 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,24 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.3.3.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A process calling <seealso
+	    marker="erts:erlang#system_flag_multi_scheduling"><c>erlang:system_flag(multi_scheduling,
+	    block)</c></seealso> could end up blocked waiting for the
+	    operation to complete indefinitely.</p>
+          <p>
+	    Own Id: OTP-16379</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.3.3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 035b00494d..254f5d3439 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 9.3.3.13
+VSN = 9.3.3.14
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 7478d3a0cf..9f91c24246 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.2.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Constant time comparisons added.</p>
+          <p>
+	    Own Id: OTP-16376</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.2.2.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index a4df2bc1a3..b80178954d 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.2.2.3
+CRYPTO_VSN = 4.2.2.4
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 513e000854..36c2e2ae5b 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,35 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.6.9.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed that <c>ssh_connection:send</c> could allocate a
+	    large amount of memory if given an iolist() as input
+	    data.</p>
+          <p>
+	    Own Id: OTP-16373</p>
+        </item>
+        <item>
+          <p>
+	    Safe atom conversions.</p>
+          <p>
+	    Own Id: OTP-16375</p>
+        </item>
+        <item>
+          <p>
+	    Constant time comparisons added.</p>
+          <p>
+	    Own Id: OTP-16376</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.9.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 59f6dd6cab..1cac2a383c 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -42,7 +42,7 @@
   {env, []},
   {mod, {ssh_app, []}},
   {runtime_dependencies, [
-			  "crypto-@OTP-16376@",
+			  "crypto-4.2.2.4",
 			  "erts-6.0",
 			  "kernel-3.0",
 			  "public_key-1.5.2",
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index e8015594a4..e5535cc4bf 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.9.5
+SSH_VSN = 4.6.9.6
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index ec7ada7c53..37f16dabe1 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,4 +1,4 @@
-OTP-14849
-OTP-16193
-OTP-16287
-OTP-16288
+OTP-16373
+OTP-16375
+OTP-16376
+OTP-16379