Merge branch 'maint'

* maint:
  Updated OTP version
  Prepare release

Conflicts:
	OTP_VERSION
	lib/typer/doc/src/notes.xml
	lib/typer/vsn.mk

2 files changed, 81 insertions, 1 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 1837350284..02a39f030c 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,86 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug when opening connections. If the tcp setup
+	    failed, that would in some cases not result in an error
+	    return value.</p>
+          <p>
+	    Own Id: OTP-14108</p>
+        </item>
+        <item>
+          <p>
+	    Reduce information leakage in case of decryption errors.</p>
+          <p>
+	    Own Id: OTP-14109</p>
+        </item>
+        <item>
+          <p>
+	    The key exchange algorithm
+	    diffie-hellman-group-exchange-sha* has a server-option
+	    <c>{dh_gex_limits,{Min,Max}}</c>. There was a hostkey
+	    signature validation error on the client side if the
+	    option was used and the <c>Min</c> or the <c>Max</c>
+	    differed from the corresponding values obtained from the
+	    client.</p>
+          <p>
+	    This bug is now corrected.</p>
+          <p>
+	    Own Id: OTP-14166</p>
+        </item>
+        <item>
+          <p>
+	    The sftpd server now correctly uses <c>root_dir</c> and
+	    <c>cwd</c> when resolving file paths if both are
+	    provided. The <c>cwd</c> handling is also corrected.</p>
+          <p>
+	    Thanks to kape1395!</p>
+          <p>
+	    Own Id: OTP-14225 Aux Id: PR-1331, PR-1335 </p>
+        </item>
+        <item>
+          <p>
+	    Ssh_cli used a function that does not handle non-utf8
+	    unicode correctly.</p>
+          <p>
+	    Own Id: OTP-14230 Aux Id: ERL-364 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The implementation of the key exchange algorithms
+	    diffie-hellman-group-exchange-sha* are optimized, up to a
+	    factor of 11 for the slowest ( = biggest and safest)
+	    group size.</p>
+          <p>
+	    Own Id: OTP-14169 Aux Id: seq-13261 </p>
+        </item>
+        <item>
+          <p>
+	    The ssh host key fingerprint generation now also takes a
+	    list of algorithms and returns a list of corresponding
+	    fingerprints. See
+	    <c>public_key:ssh_hostkey_fingerprint/2</c> and the
+	    option <c>silently_accept_hosts</c> in
+	    <c>ssh:connect</c>.</p>
+          <p>
+	    Own Id: OTP-14223</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index c6a5990f41..96c83cb0f7 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.4
+SSH_VSN = 4.4.1
 
 APP_VSN    = "ssh-$(SSH_VSN)"