diff options
| author | Péter Dimitrov <[email protected]> | 2019-07-22 11:31:24 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-07-22 11:31:24 +0200 |
| commit | 993139cdbe67523027aa69ec8542d32dd99d4b77 (patch) | |
| tree | d1627b416829b2a0bb8b6b66e1d14938e4ec0282 /erts | |
| parent | 50d781793027157fc3a8ebf24c7bd7610c2752a7 (diff) | |
| parent | 9ac121ae7a077695f19f7a370210575d9dbbb9bd (diff) | |
| download | otp-993139cdbe67523027aa69ec8542d32dd99d4b77.tar.gz otp-993139cdbe67523027aa69ec8542d32dd99d4b77.tar.bz2 otp-993139cdbe67523027aa69ec8542d32dd99d4b77.zip | |
Merge branch 'peterdmv/ssl/fix-tls13-alpn' into maint
* peterdmv/ssl/fix-tls13-alpn:
ssl: Fix handling of ALPN in TLS 1.3
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions