diff options
| author | Hans Nilsson <[email protected]> | 2019-05-22 11:31:40 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-05-22 11:31:40 +0200 |
| commit | 51faab4ae2da244881c297205fd13ca1c5cbaec5 (patch) | |
| tree | 25f969be8254c45e80e1b7b29397a2f0a14f13dc /erts | |
| parent | 4be2f005500d1608f1b290ded0e4271885911ac3 (diff) | |
| parent | c8230dde231c3d7cc6807714eb46741006f792b8 (diff) | |
| download | otp-51faab4ae2da244881c297205fd13ca1c5cbaec5.tar.gz otp-51faab4ae2da244881c297205fd13ca1c5cbaec5.tar.bz2 otp-51faab4ae2da244881c297205fd13ca1c5cbaec5.zip | |
Merge branch 'maint'
* maint:
crypto: Re-enable aes_ctr for openssl cryptolib < 1.0.1
use correct module name for standard_error
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions