diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-02-22 10:49:31 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-02-22 10:49:31 +0100 |
| commit | 89d7e21cf4ae988c57c8ef047bfe85127875c70c (patch) | |
| tree | 1e774a6ffa8f25f8f9b012f702779aed897aa9e3 /erts/emulator | |
| parent | fb39a2dd41a5bb14e1f84935798e09ab3b747c85 (diff) | |
| parent | b254f5a83145b348def5950d46628d3f4549585e (diff) | |
| download | otp-89d7e21cf4ae988c57c8ef047bfe85127875c70c.tar.gz otp-89d7e21cf4ae988c57c8ef047bfe85127875c70c.tar.bz2 otp-89d7e21cf4ae988c57c8ef047bfe85127875c70c.zip | |
Merge branch 'ia/ssl/connection_information/OTP-13232/OTP-13343' into maint
* ia/ssl/connection_information/OTP-13232/OTP-13343:
ssl: Newer cipher suites now presented correctly
ssl: Include options form connect/listen/accept in connection_information/[1,2]
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions