From: Fabio Scotoni <34964387+fscoto@users.noreply.github.com>
Date: Mon, 2 Mar 2020 07:35:42 +0000 (+0100)
Subject: Merge branch 'master' into master+randombytes
X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=424d630ec0432b77228bb34eec1fa583dc0e7e5a;p=Monocypher.git

Merge branch 'master' into master+randombytes
---

424d630ec0432b77228bb34eec1fa583dc0e7e5a
diff --cc doc/man/man3/crypto_key_exchange.3monocypher
index 1875fd7,d02ac3e..3134306
--- a/doc/man/man3/crypto_key_exchange.3monocypher
+++ b/doc/man/man3/crypto_key_exchange.3monocypher
@@@ -10,7 -10,8 +10,8 @@@
  .\"
  .\" Copyright (c) 2017-2019 Loup Vaillant
  .\" Copyright (c) 2017-2018 Michael Savage
 -.\" Copyright (c) 2017, 2019 Fabio Scotoni
 +.\" Copyright (c) 2017, 2019-2020 Fabio Scotoni
+ .\" Copyright (c) 2020 Richard Walmsley
  .\" All rights reserved.
  .\"
  .\"
diff --cc doc/man/man3/crypto_x25519.3monocypher
index b17924a,8a4562c..bc0a159
--- a/doc/man/man3/crypto_x25519.3monocypher
+++ b/doc/man/man3/crypto_x25519.3monocypher
@@@ -10,7 -10,8 +10,8 @@@
  .\"
  .\" Copyright (c) 2017-2019 Loup Vaillant
  .\" Copyright (c) 2017-2018 Michael Savage
 -.\" Copyright (c) 2017, 2019 Fabio Scotoni
 +.\" Copyright (c) 2017, 2019-2020 Fabio Scotoni
+ .\" Copyright (c) 2020 Richard Walmsley
  .\" All rights reserved.
  .\"
  .\"