diff options
author | Hans Nilsson <[email protected]> | 2015-08-06 11:57:58 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-08-06 11:57:58 +0200 |
commit | ee5587d585052fe7b64c972029a6c68c403b71dc (patch) | |
tree | e163266fb0a69b3ca27bb2811a52cb419039d243 /lib/ic/src/ic.hrl | |
parent | fc2e067c61cf2afbf298f05c28a8c6112daa9d0f (diff) | |
parent | b2e9955be035d1dce8ef118b341a79cc05339f44 (diff) | |
download | otp-ee5587d585052fe7b64c972029a6c68c403b71dc.tar.gz otp-ee5587d585052fe7b64c972029a6c68c403b71dc.tar.bz2 otp-ee5587d585052fe7b64c972029a6c68c403b71dc.zip |
Merge branch 'hans/ssh/diffie-hellman-group-exchange-shaN/OTP-12672' into maint
* hans/ssh/diffie-hellman-group-exchange-shaN/OTP-12672:
ssh: announce dh-group-exchange
ssh: document new options in doc/ssh.xml
ssh: more dh_gex test cases
ssh: options 'dh_gex_groups' and 'dh_gex_limits'
Diffstat (limited to 'lib/ic/src/ic.hrl')
0 files changed, 0 insertions, 0 deletions