diff options
author | Ingela Anderton Andin <[email protected]> | 2018-01-09 09:16:27 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-01-09 09:16:27 +0100 |
commit | 18c08d11a954f1e8cd1d01d6a85bc7497a866fbf (patch) | |
tree | 6f69b2b9e6e798caf194711aa6cfe342f016f25c /erts/lib | |
parent | 19b7ccfe076d88a96b62f3222f38be31bb087df2 (diff) | |
parent | 39fb981193c137ba6e3621bae49c07eb0b4d92cf (diff) | |
download | otp-18c08d11a954f1e8cd1d01d6a85bc7497a866fbf.tar.gz otp-18c08d11a954f1e8cd1d01d6a85bc7497a866fbf.tar.bz2 otp-18c08d11a954f1e8cd1d01d6a85bc7497a866fbf.zip |
Merge branch 'ingela/dtls/test-cuddle' into maint
* ingela/dtls/test-cuddle:
dtls: Filter out rc4 for DTLS psk suites
dtls: We do not need to wait for DTLS over UDP server
Diffstat (limited to 'erts/lib')
0 files changed, 0 insertions, 0 deletions