diff options
author | Ingela Anderton Andin <[email protected]> | 2017-02-22 15:56:09 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-02-22 15:56:09 +0100 |
commit | c6ccce9bb9d8bd5b26f27cd09a3611f60a317073 (patch) | |
tree | e9653886d502f04a2a6944a59af9fce65ffbafd5 /erts/emulator | |
parent | 833de830b9805666f3a6a3752d5339aa0a577a3e (diff) | |
parent | 0b049a4ed566fde7ec4b60ab36229959aa5c9401 (diff) | |
download | otp-c6ccce9bb9d8bd5b26f27cd09a3611f60a317073.tar.gz otp-c6ccce9bb9d8bd5b26f27cd09a3611f60a317073.tar.bz2 otp-c6ccce9bb9d8bd5b26f27cd09a3611f60a317073.zip |
Merge branch 'ingela/ssl/default-ciphers-suites/OTP-14235' into maint
* ingela/ssl/default-ciphers-suites/OTP-14235:
ssl: Always prefer AES over 3DES
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions