diff options
| author | Hans Nilsson <[email protected]> | 2018-05-08 11:43:35 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-05-08 11:43:35 +0200 |
| commit | 143569f30151422b6a5b0fda662061d41ff82d74 (patch) | |
| tree | 25786e520e3c1063946de6c291971dc85da1a00c /erts/emulator/beam/erl_hl_timer.c | |
| parent | 26eea10dda1f316045e58e30a126feafe1843d3a (diff) | |
| parent | 40ab3958644be3fc14682c54233514fdf880386a (diff) | |
| download | otp-143569f30151422b6a5b0fda662061d41ff82d74.tar.gz otp-143569f30151422b6a5b0fda662061d41ff82d74.tar.bz2 otp-143569f30151422b6a5b0fda662061d41ff82d74.zip | |
Merge branch 'maint-20' into maint
* maint-20:
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
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.c')
0 files changed, 0 insertions, 0 deletions