diff options
| author | Hans Nilsson <[email protected]> | 2015-08-04 10:57:26 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-08-04 10:57:26 +0200 |
| commit | 85d2630e9b4c0f982b88528f5f9dd4dd2472de84 (patch) | |
| tree | 525bb852287bf096279ce6734c3b3ecae6bb5508 /erts/emulator/beam/erl_alloc.c | |
| parent | 1bc032259f571f3c7c00aad8ee1b93fb452f2d40 (diff) | |
| parent | e05f0b617f85547cc3c537dda3678d9c9a0e80c1 (diff) | |
| download | otp-85d2630e9b4c0f982b88528f5f9dd4dd2472de84.tar.gz otp-85d2630e9b4c0f982b88528f5f9dd4dd2472de84.tar.bz2 otp-85d2630e9b4c0f982b88528f5f9dd4dd2472de84.zip | |
Merge branch 'maint'
* maint:
ssh: added more groups for gex
ssh: rm ssh_math and use crypto:compute_key instead
ssh: filter algs unknown to crypto (except pk)
ssh: add test group
ssh: Add experimental 'diffie-hellman-group-exchange-sha256 support
ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 support
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
0 files changed, 0 insertions, 0 deletions