diff options
author | Hans Nilsson <[email protected]> | 2017-10-03 10:11:19 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2017-10-03 10:11:19 +0200 |
commit | 8fb29181bca26c221ca0a3364f71f79d3d3a4db4 (patch) | |
tree | b8df1dd71275d77f45e513c84306c86fac6f6627 /lib/ssh/vsn.mk | |
parent | 237d0c7d230534ef99a11d388ebfd0c1e83af548 (diff) | |
parent | 69292a11cd4b31fd3ff73b44f28d527f2d16f555 (diff) | |
download | otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.gz otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.bz2 otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.zip |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
Fix zlib merge snafu
ssh: fix broken printouts
ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
Diffstat (limited to 'lib/ssh/vsn.mk')
-rw-r--r-- | lib/ssh/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index c201e70d82..5154658e8a 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.6 +SSH_VSN = 4.6.1 APP_VSN = "ssh-$(SSH_VSN)" |