Update my email address and PGP keys

[email protected] is still a valid email address for me but I am
using [email protected] going forward.

[ci skip]

3 files changed, 70 insertions, 45 deletions

diff --git a/doc/credits.rst b/doc/credits.rst
index 290067491..ee019070e 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -79,8 +79,8 @@ snail-mail address (S), and Bitcoin address (B).
   D: Curve25519
 
   N: Jack Lloyd
-  E: [email protected]
-  W: http://www.randombit.net/
+  E: [email protected]
+  W: https://www.randombit.net/
   P: 3F69 2E64 6D92 3BBE E7AE  9258 5C0F 96E8 4EC1 6D6B
   B: 1DwxWb2J4vuX4vjsbzaCXW696rZfeamahz
   D: Original designer/author, maintainer 2001-current
diff --git a/doc/pgpkey.txt b/doc/pgpkey.txt
index d1a0eeffe..605596159 100644
--- a/doc/pgpkey.txt
+++ b/doc/pgpkey.txt
@@ -40,10 +40,9 @@ This key can be used to contact the primary maintainer:
 
 pub   rsa3072/57123B60 2015-03-23
       Key fingerprint = 4E60 C735 51AF 2188 DF0A  5A62 78E9 8043 5712 3B60
-      uid            Jack Lloyd <[email protected]>
+      uid            Jack Lloyd <[email protected]>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
 mQGNBFUQXRMBDACZJvcSkr+GNDtIdP9fQWRXByriiIKvuKbqU8KGdhTcPeKwl3y3
 l1W9XsWA2DJ8QDKo4ZcV0lycszIvwBLZllJJWSVNFKxJK2IW33xcIo9dhNqj+hcz
@@ -53,51 +52,70 @@ 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
-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
-kSZSXDGg/rs23aYdtiH9
-=o8bh
+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
+Bge1rMhlCoJJhJEmUlwxoP67Nt2mHbYh/Q==
+=whx5
 -----END PGP PUBLIC KEY BLOCK-----
 
 This key is used for signing git commits:
 
 pub   rsa2048/AB50F90D 2016-03-03 [SC] [expires: 2020-03-02]
       Key fingerprint = 1175 1014 9DF4 18AB D19C  B06D 9FFD 596F AB50 F90D
-      uid   Jack Lloyd (Git Signing Key) <[email protected]>
+      uid   Jack Lloyd (Git Signing Key) <[email protected]>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
 mQENBFbYWi4BCACjgz3gYgWMybPLiovNLnLonG0ex2y9kJgsR+Pm08L2fwCVCaHx
 wjlK5Oq04x3bvujZk7P0TThqS1WonYtEiVxz3Hcvt7rlU5fSCj/1uYmZV+mbPBdY
@@ -121,6 +139,13 @@ CnNawPb/9xlQY+lCpHILfvFsVty5djqHqDNKEBuYxyPjHICPGRukSK+zCS0EE8nz
 /oxor4OIr5svawfIO5Zw69USo01jC+K1OSRJQthFft5GqTwkfHniYJSVh7K1rPI/
 H35tf+XZLBwlafWs7vQb8XZfAPzhqw9blc5RS478rqzNQ0F1PHITjbaSCkMCgaNa
 2aeaoIw9uQjp6uB2T4xGAeqsd6JPrr5g1VZFPqthXdiDu6JmN4aVksG/SCx2Cwv2
-qiuS
-=Q88Z
+qiuStDFKYWNrIExsb3lkIChHaXQgU2lnbmluZyBLZXkpIDxqYWNrQHJhbmRvbWJp
+dC5uZXQ+iQE9BBMBCAAnBQJYD2ybAhsDBQkHhM4ABQsJCAcCBhUICQoLAgQWAgMB
+Ah4BAheAAAoJEJ/9WW+rUPkNXfIIAIOgepYeZN2HL2T3A8pk+5JR2cfBoRufYgnG
+6mVHPejgZDW+9PH1tPDgidnePw3/jfD1oskt1VwOCkqaSBAcG2QeOBEklcsrQuvO
+fW7B7XFydYGwT9Fm8/sxekiGjDQQWQEEH4j3Vt1GlI2sJrpqMe/WMXISsEnLfw0k
+DspUSlFOn8oyrBU9Pd8KaSi38lp05a9Mcun5enJ3JpQHQ5RlNXDNh/Sn9NZ+MKWg
+gytZqIy82jnv6zo0raZDup4hLKopjen/SINR5XcwRK2lUtYVwwQH8FHG9IkeVJNW
+JkVCdZLB08sq4WHRbtVjy6mpvEHTmolAtHjLSiV5W50LDKLwX24=
+=kbUT
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/doc/security.rst b/doc/security.rst
index 6223943e0..4034a5878 100644
--- a/doc/security.rst
+++ b/doc/security.rst
@@ -3,12 +3,12 @@ Security
 ========================================
 
 If you think you have found a security bug in Botan please contact
-Jack Lloyd ([email protected]). If you would like to encrypt your
+Jack Lloyd ([email protected]). If you would like to encrypt your
 mail please use::
 
   pub   rsa3072/57123B60 2015-03-23
         Key fingerprint = 4E60 C735 51AF 2188 DF0A  5A62 78E9 8043 5712 3B60
-        uid         Jack Lloyd <[email protected]>
+        uid         Jack Lloyd <[email protected]>
 
 This key can be found in the file `pgpkey.txt` or online at
 https://keybase.io/jacklloyd and on most PGP keyservers.