diff options
| author | Hans Nilsson <hans@erlang.org> | 2018-05-08 11:44:42 +0200 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2018-05-08 11:44:42 +0200 |
| commit | 91235f1aa793bb9f954c2408c859ed199839343b (patch) | |
| tree | 211abd9148a06c4b2f759c83ea2be5979e386bb3 /OTP_VERSION | |
| parent | 80c5f0f27b84173b83aaf0ecfb8f839660b918a6 (diff) | |
| parent | 143569f30151422b6a5b0fda662061d41ff82d74 (diff) | |
| download | erlang-91235f1aa793bb9f954c2408c859ed199839343b.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: Renegotiation -> renegotiate
ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419
crypto: get_engine_load_cmd_list excluded if no engine support
crypto: Fix compilation for LibreSSL 2.7.x
crypto: Disable test_engine if engine is disabled
crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
Conflicts:
OTP_VERSION
Diffstat (limited to 'OTP_VERSION')
| -rw-r--r-- | OTP_VERSION | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION index 2f45cf5f2f..2acad36e08 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1,2 +1 @@ 21.0-rc1 - |