diff options
| author | Hans Nilsson <hans@erlang.org> | 2018-08-23 14:27:40 +0200 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2018-08-23 14:27:40 +0200 |
| commit | c1def1f61f74ac6e8e0703d01d0819d142c11de5 (patch) | |
| tree | 30c44807dd0f4272efe2b1b9e4267b2a7ce47dfd /.mailmap | |
| parent | 15785a2f9167e85d52d8e6d238624f5dcdc7cf7d (diff) | |
| parent | d3e7e665d8b687094c0857dd086654350bec9055 (diff) | |
| download | otp-c1def1f61f74ac6e8e0703d01d0819d142c11de5.tar.gz otp-c1def1f61f74ac6e8e0703d01d0819d142c11de5.tar.bz2 otp-c1def1f61f74ac6e8e0703d01d0819d142c11de5.zip | |
Merge branch 'maint'
* maint:
ssh: Doc updates
ssh: some benchmarking of chacha20-poly1305@erlang.org
ssh: -spec
ssh: Add chacha20-poly1305@openssh.com cipher
crypto: doc poly1305
crypto: doc chacha20
crypto: Error in test case
crypto: chacha20 test case
crypto: poly1305 test case
crypto: -spec
crypto: chacha20 cipher
crypto: Mac POLY1305 if >=OpenSSL 1.1.1-pre8
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions