From 32bfdffa554a2d4255c15b6ca893c290e9bfa466 Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Sun, 20 Jul 2025 14:58:08 -0500
Subject: [PATCH] Adjustments to gpg public keys

---
 home-manager/programs/gpg.nix                 |   4 +-
 .../mlaga97_with_revoked_uids_20240419.asc    | 249 ------------------
 keys/systems/bastion.asc                      |  29 --
 keys/systems/blockhouse.asc                   |  28 --
 keys/systems/living-room.asc                  |  29 --
 keys/systems/ll-latitude-e5591.asc            |  29 --
 .../ajfunk27_pubkey_20240129.asc              |   0
 .../mlaga97_pubkey_20250524.asc               |  76 +++---
 8 files changed, 40 insertions(+), 404 deletions(-)
 delete mode 100644 home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
 delete mode 100755 keys/systems/bastion.asc
 delete mode 100755 keys/systems/blockhouse.asc
 delete mode 100644 keys/systems/living-room.asc
 delete mode 100755 keys/systems/ll-latitude-e5591.asc
 rename {home-manager/pubkeys => pubkeys}/ajfunk27_pubkey_20240129.asc (100%)
 rename home-manager/pubkeys/mlaga97_pubkey_20240419.asc => pubkeys/mlaga97_pubkey_20250524.asc (72%)
 mode change 100644 => 100755

diff --git a/home-manager/programs/gpg.nix b/home-manager/programs/gpg.nix
index 0d49532..e61fba7 100644
--- a/home-manager/programs/gpg.nix
+++ b/home-manager/programs/gpg.nix
@@ -5,11 +5,11 @@
     mutableTrust = true;
     publicKeys = [
       {
-        source = ../pubkeys/mlaga97_pubkey_20240419.asc;
+        source = ../../pubkeys/mlaga97_pubkey_20250524.asc;
         trust = 5;
       }
       {
-        source = ../pubkeys/ajfunk27_pubkey_20240129.asc;
+        source = ../../pubkeys/ajfunk27_pubkey_20240129.asc;
         trust = 4;
       }
     ];
diff --git a/home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc b/home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
deleted file mode 100644
index d76c5ef..0000000
--- a/home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
+++ /dev/null
@@ -1,249 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-M4JjATwU+3DOjnrZdwE=
-=WMur
------END PGP PUBLIC KEY BLOCK-----
diff --git a/keys/systems/bastion.asc b/keys/systems/bastion.asc
deleted file mode 100755
index 166f62f..0000000
--- a/keys/systems/bastion.asc
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBAAAAAABEADqOI52GaSe+4UIwe9iavQavyulxPy3RD1h8ZQUdKjkp4B9z6Lf
-U+PHpJhROn5ZfDKcFlnq77tzdnzCcqzT5saqYKugJK3fyDNXvKMXClvXeDAoHDuk
-jMVFZdhDPzwcJJlsW4frvPodlcFAuyCSFTjt3SGDApow2/7I8Engz/0vpWribZf8
-iv2icaQRQuZ+CLawabYHm84Ik5gSH3qqMl3+xPwGKmlSNfjPmUNHg2ldH70IxAEi
-2b/4TpBMUYGkB2PzMjpIM51AZHwr/fbDI5P4MLfyyoz/D6XPauMaL7GajYaexmBZ
-xxVCXcgDNgOTmeX5qb3n/TpKdovMAyA1ZeyAQpT6qv25BXjdYnZlAGMixAtzVMl0
-RGSSvVdDvTZS13bMrLd+Vs1o5SsUA3toqAtEfT12DycBQNjvAPOW07BqEybngIXc
-NdobBrgmEa9xwquqR+JqO0BlBb2iZnNHqnYUMMq5WuyYTsFlQusCYCW0egFu9y4n
-sqef/PRvbupiv+gU7ZG3ccHcoumNi9gDafxPncUm+bHp0ZnevEzPIccxJz0S8gxG
-ftM9vW4GGGIiPMdKppG/tcb7oti4y/sQRXr+1Oy+SO6estwJtS5A7VGBJT/JQmkB
-TWw/8hxO/vc3/Xciz+ExlqX4GvcS34VmbN1RHVPsxsDvhdPsRqBEU9X+fQARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBrwQT
-AQgAYwWCAAAAAAkQaIIFEhPzD8g1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3Bl
-bnBncGpzLm9yZ7LpPhmm7fQCtFvEwf2eIu4CGQECmw8WIQTaYp43R8TFqTHQqPNo
-ggUSE/MPyAAAYQEQAI3PrKgX6vUr8mCH12/Ct9CRAa5iE8y3+R3lkwnQjkWrgxR7
-K482HBZnT5Gl27tP8U8wkgsGaurO/lpcHElBoRcuppRt3H452u3ICMV7nmvtxUs/
-E5xwEdFDejr0Jw2oL499PwgdSW0jzKWJ7OtuKMhOoWgw/E8CrhQU/dc+QlhDA5bg
-dh7LlFdr4xbD8fkdbpg/zNaU2CZjBNBVr54Ljp8DH9b2Eo66Z44op2E7rfHL0sot
-8v6hJs8HqETt9Yragl5yyd/DwJWjj9oaRasPHbmMHmf5jaKRMs7WX0nyDmyloBRj
-4F4JjpIvbBoSDAlKG3PNgh/fuRqZDSMB1I3gfx4zhFH5inmbywFP/ZT/Ur/z9Wbf
-6K4p0sDZtT3dhF0hBbA8pNBj+sf5J+DLH3oEZ8EDKF7XN/tpMvSK6j22L+IBREdV
-NmZpyxNFGwfX2s7B9GvoDDD7aUOlpaLrzRTL5HpvleRaIB9Dc/76XiEeSYlspG9P
-MyiLtKheRqKuvHY703wHHVVEe61ckoYqdgydQGARhmqCESsDWumXwNILJ3LtMafd
-zigA4aEp1ZHlF7ZdD0/O34vJ5pkwJLVdK5P2zdDCPEBzJlN3zn0JcTh5BUsj0hv3
-oEVDzItehS63440pW01iWKX6ejD7Sx/8pkBUBbAHKcrN6jkivRTbYYk794y4
-=wo+J
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/keys/systems/blockhouse.asc b/keys/systems/blockhouse.asc
deleted file mode 100755
index 0b832db..0000000
--- a/keys/systems/blockhouse.asc
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBAAAAAABEACkgEAnau0HyVBnBBxvCI1SHFJpXoQDeY3ojP8KIkHQvrbuPa0E
-QVVopafELuSRfLjA4KiSMkVqK82xlRe9Cgxf26pEuIE9KZYPCse+oRDeYVORpblC
-xOlKOOQ9kVBEHLMvo0ezILB1ke+WHopDs+usMvF1xa3ccd0tnyanXvP041W+tCJO
-i2R+ctEzd/+OuBBngKupR5GEjCV51C5cAIgzi61au4yeYzvX3b0OOaWFQAxUa1rD
-zjo1yoC7DVY92YHfcDufoYXkLZpsyBGEw53mBELT4RDJxgmT2P9w7bvfvilq0GmA
-yGrFk9d6BkP8UouJA6nCCPD2dH8Bo1LxzqM4s24MLGMDW7Igqg03iA8+pG3fMbDd
-p5jOmT2st1IJTbR7yAnt/g+UmLn7B/bhaSnd2mBFRqyUVuoNC+7vGgjERA3K6PQU
-TzUtOd+fgY9U+yenvbjlBhXzFhjmTw4venVC7jDtre9uyEfFi4wQabLcuYIhMOgh
-cLprU6CRpokAjw2smsSmqXn8HtrQbu+ggRp5h9bZ7PhrddcmHGuh3J7poPweYcJJ
-+KmuztEbm1tGbxYuRyDYe8+jWMIhuhdVbQ6xl7gXsZoaggHtZjffEP/eaduKtMj7
-6qNcqf2D9NJhsnEsrxzXcQh/iHFrlXxrGiXkY6JNDMWaR7eJEfyvvcukdQARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBYgQT
-AQgAFgUCAAAAAAkQNUtXHG/lx2ICGw8CGQEAAMNBEABye+VqbogCXMiiq71XyCf1
-g42Dg5pnhknVcp2Ez6YzYxuv8sAshcXqjRZocgl+757bFJUWlCXL0GJzFoBTnWag
-M4rI80BickU3I6Yd+lbxgcBcJ+q9iYTIV4uwxje9wC6n4QgxNNfmvwHrX9I/ec2A
-5Z97inhxMGPp0L1d1+NKYxMFO0Dc61+463L2WxsVnhEtDLVtklIvUfuqajnGbv83
-2wcd46PpwnNoW/M5+uqO4f7lRxDQS24nMRzKugg46VFpfQ8Eur2uv76RWY4n+ssj
-MYrqmQJLrlqJrvR/QOzAdnOp7n2w46yQb6AvDnvU+LjXLJjCUdLlFw09z/zt7Ipb
-JjJ3s0bwrtRUc+wql84MgKWgykWQzsnniSvaru7a7V8oYHwSIwMBJocMYy3qh+Hd
-OK2Et2lklyH0vdk2nAsEluHjoNM0tmkj92MHbk5vZI5qabL8S0cMLn9UUC8wzsv0
-pRBPYCu35Mu4wfE5XpYZeoGol7OsSizrd94z2EoUZ0+BAkLVseWT/mKBmn8VF4Sc
-Ds1gK3a+699lWR8DtHamPiV+c3Ok65w3QCJH5s3L6wvG7iuJ+cYOkod6RRxFxRGw
-V3s7HX6ldY+eemH++Fn1qBeSkSAr6cB3QVCBxPVr/6sFlywCpkYFMTCaGrKcZV+e
-vWybcBEfyKujBt8us3N4mQ==
-=/7y4
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/keys/systems/living-room.asc b/keys/systems/living-room.asc
deleted file mode 100644
index 3f3a7e3..0000000
--- a/keys/systems/living-room.asc
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBAAAAAABEAC/fKC5FxgW36qQLBLUvnJ9VgSoXZoJXg2NMmMEWNg0ypV8q/pu
-BNBUhnPV7tE+wR0PoAhC7PuyFU9xOnVotLQ3Htm0vbuctrT6J0bn44O8GOQVbrq+
-/A97uU9SPliUJaiaJ/AnLN3w3impRMXkL9/kYF9OvmDrhucsfvRGi8y/7QXW/V/N
-nWO9GHvHsAZ3QDJBqOS+82jNSXAcELpumGCU7BoSusZSxvjzY496mouOgNAmg2Jh
-aipBbs/IrMmbDbuktJnyzo4XXvW/pTg+S0uDYqOhRYhnAnBdgxUn8YQNuf1gtawe
-o4ekvo8DWeaae7yRs0PkBTXiAEjJyrcj0ih7Hl26AMzedGukX1Nq1fffidtK2l3B
-0BUwYa1s90mtZe5w+9N7RoP6bnyJClEISUdHcunX5nKFvIF4mShTELonGv4t3a6i
-4goGdXrVMhu5FOwn5BbkGUwiJVDUBMHtly1aGEtOQY//lnk/ERQMKqoYagT9geCZ
-KgQ7EEerW66JUEgEJRSpg0F4uFFEe0QkNRIqPTLsHkXs52NAKjnT+Wr6Xkf/1aNi
-vfRgog0UAIsFOuTZy3vssb9tyS/+V15y3P9E7fTm4kiHEu8FP3L/3KZTh2kYP7G4
-PPYpUCGvEv/GBuTeyUyu4IH2A9vD+Oo4kOYw+3UTX3FwlzJM8XkiqHCd5QARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBrwQT
-AQgAYwWCAAAAAAkQo93+Va+TMFY1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3Bl
-bnBncGpzLm9yZ2GW9Ca1b09Z21zt+k6LixQCGQECmw8WIQQ8Y7ykFvDSH+8fvFOj
-3f5Vr5MwVgAA66QP/jA22KixwBFPpLFKomJ8f7gLIUVehM2E3p85+XdI5Q5eZXDb
-7fy1u//FCjsZq7dcNz4oNU6Br0oVoTIKG/aCrLchrxx3+Rbey6XsqtIg448MQrN6
-w/YibVxYgIN8Tief61utAZGT4+ZJAO1sfe4GKzUgnbWUBltLya8nvlmqaIUDODeg
-shSMFKIwbuv/adU1QcmWmwXX/Yxh2aQnN75W562j2xjf0g8ANDoXk/DGDj/F+P6r
-B12q5ksJDpK4k+Ve+166XKJk/CnP/uI2AVEMEG8mKU3+mxHMjzjI0dKmzsai2Nqe
-mo0uz6duzS6Z7I9vlimXJhNsDEj3VigjOTWtUQdP5S1lZE+ZKL01ThtcDUOpUfMg
-NwropMeRmAYbhynfp1V2w5EtWlxeAQWwF2OJN+stMujeLr6OcFtAugJx63Jdc/Rz
-QqG8QFhtqiSQaCTUzN0h7WEwMPGQTJzYpkTneTfUaaCrJ+YbWFj8Ahlg3FEu0hY2
-9kEFctYL7TI56aq/3e/UZjYRGj4MM7KNfoKdXyAGhQk0xM3/JJhQcjdZyjcWx06I
-EBHvLHMfRSueFBHYUzhnYFZQc/ZAuqqVUnOEiSnvUnDbk0Mq3t2VFwW+L0AHHDHX
-3Svt03lzIY/uVod9Tc2HqTXyzoG2KC37+p0BE8/yvjPhGl6reXCkwhVaWmeM
-=K5Z3
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/keys/systems/ll-latitude-e5591.asc b/keys/systems/ll-latitude-e5591.asc
deleted file mode 100755
index 2f95759..0000000
--- a/keys/systems/ll-latitude-e5591.asc
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBAAAAAABEACo7siQGYfS1Nwbhh+vIHE7EdNT2tDWY7x8Tt/PHeWulMa8xVJF
-jrY/RHGHC5tAOqatzeU+DCCm3d/G4dqrhqloKKeBC2EpEb1zSJ3W7ZqiIrbK0QRO
-9S1ALyyvI9FFfO27ygW2hpN3dipG6CJJ9pCGcfgPBTyjV7cgZrEAH0UV8+Sq9T6V
-k963Uzu+ruoFHu4db2eez0QbQYPaoIEPBZdwVwI+/rBr2gwPoc3fGI28zKZGY0u0
-8UN7mv8324vxk3Vkkur6yHKlLCn1HE+n4WFwKkzuEfQTe3mGLkdhW9ZWEQEOwy89
-NUCwfXaDxda97M/GDROGrReteYJzQkOs9NlG8lavaGXU9OeWqwH9h/9IHxCksASy
-N9mFWvuL8wQ+/LeKSALVbjdOQ3WDt40tV32LU/yO11sKZQ2kHR2bDJyzTQRSRGSb
-tHejx0+UEmczgHcwIPeRKm/esERGidup8cB+9UUe+JoRPJiUtcmIW9L2IuU3zGkN
-zF5SS6UetkqaOTb23VkDA/VjmUwjotOmi/1gxbWhvOy2GY+7eL/Mv+GHpNR/J8LJ
-kGMXlfvGRxOec7MKPGK3OE55UipoRbfteTaA8cGuTeQeAqUL4p9tty/kCzNYHFd2
-3+kf2ek1HK3LVaAXl+04erG4Qlc/pzMeade/Y+mE3Q7KPC+kKNeJJCVjwQARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBrwQT
-AQgAYwWCAAAAAAkQlI154wk8RVw1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3Bl
-bnBncGpzLm9yZzwdtmb3uyvy1+BhiSmOIBwCGQECmw8WIQQBwCr50GtLvF0m7AGU
-jXnjCTxFXAAAPCIQAJnF9UemdnWlZMSIrt+9tgN78oWtBcxRTwaAl7eysA628l4w
-D7INcHAYoRh74GEvZIvLUoCvH4r5wpuPhP8l+SiG1A6IlNa+pWCuSTsjRk6PtcGJ
-gx+uxGJM18FLXj59C2GPD70JPhYdVMqGR4sH5LHaAROIj4qeWiBTZfHxSazrfTZ+
-0Sd6/UDMXfoRiXCJZPbOES108oxNpT6U5iJlPnX1AC7W5FGhhOaeS3xLEQHFsoqG
-SN8qNPiB6inAOfTDr9++r4mWkwJiTEEpcCbKH71G+7yriL9hOi6Gaau2Cbd8lUPt
-K9lhlmqzJ5/fRCuDX8zKeh4mYyQ1Q5Qdt+lYrRlJaEPyH8a5eW/zh5ykDFNlHYZa
-BLhVxv+HNeo+FSH//Jo2AcASCeLcSTjO3kyY3AAbqyjWqt5jMU1tQkJ15EG/z5Nz
-Z94x1zqqzxBYV2EhVyQiLgxpYq/9mvT2V/ep6wHA4105dASNR0nIPia6gEMGjZEW
-MctxAFHdPsZA0T/C+4AybSciApJAqTqetI5lnDm5yzc1H03/0q8jn4qCX6+P+/yo
-VDbIRWlMv0pik++Uhl+D9D1wsjakTYtPXPVHPHR7RNmZ3ye4if/xMz3uv7yeNIQf
-BhF0bEKf/cYwTlW860cJBIVY3iwav+j03ZqZNEQoFKqvCPFsEAYPvLjBCWU/
-=Zi65
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/home-manager/pubkeys/ajfunk27_pubkey_20240129.asc b/pubkeys/ajfunk27_pubkey_20240129.asc
similarity index 100%
rename from home-manager/pubkeys/ajfunk27_pubkey_20240129.asc
rename to pubkeys/ajfunk27_pubkey_20240129.asc
diff --git a/home-manager/pubkeys/mlaga97_pubkey_20240419.asc b/pubkeys/mlaga97_pubkey_20250524.asc
old mode 100644
new mode 100755
similarity index 72%
rename from home-manager/pubkeys/mlaga97_pubkey_20240419.asc
rename to pubkeys/mlaga97_pubkey_20250524.asc
index 4fc7444..9f7b1a7
--- a/home-manager/pubkeys/mlaga97_pubkey_20240419.asc
+++ b/pubkeys/mlaga97_pubkey_20250524.asc
@@ -62,8 +62,8 @@ VEZH7gq94rTrrOwkV/2C7j8D0h+oeXFpORZgEKItlsKJSFGgcXpzTI+sF/43VC7o
 R2XZhXNryG5MxO0cT3nMuXGAEkqrECo0DcZ4NkjERyvH9LMwHvFY8GRh0oSji+GT
 tWuN1WGZvJHOGCVD9V6Fc34s+bkeZyUM8lyX+8vr4oqHLGF0tGXGEDZN4SWv+jF0
 W+1Z4BPh1vfrxMAZKj9axSAJcpp218TxF2GIoDWGPjDCXTOi+rCFxfgWfQJ9CQAR
-AQABiQRyBBgBCgAmAhsCFiEEX3gmG2XFZQQWYqO3/4/DxzW9SlEFAmYi5xAFCQxM
-FOsCQMF0IAQZAQoAHRYhBKz68+79ojdrskFDTsfxhd4zvHo0BQJbuAWlAAoJEMfx
+AQABiQRyBBgBCgAmAhsCFiEEX3gmG2XFZQQWYqO3/4/DxzW9SlEFAmgyEx0FCQ5b
+QPgCQMF0IAQZAQoAHRYhBKz68+79ojdrskFDTsfxhd4zvHo0BQJbuAWlAAoJEMfx
 hd4zvHo0LeMP/0tGfG2B0GHbXzb4PSY1YS0FVzWUmpuw3UQ13RBIMzR3Y3cOJCup
 CBMp/3L4UxpiPuNV80SaFoO84+KMagQdhUcOSp/pHDXbrzsvmPw59vB/Sj17BZ7s
 lbyEJovNLzgd4yfkl3VVCwtnUGS85ZjRLf1hlWdn9fWWSCyfJZdeRlsa53fgj+iv
@@ -75,17 +75,17 @@ P0tEYnsOUZFVXn6S/7Ho2coBN8i03ewagqbsFKDZ4Qx3vJAnibvpDPWIcMAtiDNl
 MZDzDXv2/Ramt5yRHc7cgGwJSvExPor+7reKQNGu+kRqbh+VQNVpuqkmWwHE3DYG
 ha1PJKKZgAlVWwrjsjE/Rt5P8UH8Md+4CZOYp8tnCDS5GsXjlNECXrXx2mS9LOuk
 WzZOOtD21P2EUaJf3eGzg/F7rZBj+QCC1ATFWoxNC3/csahW8slXX3zZCRD/j8PH
-Nb1KURR/D/47X/gosSVTwYEndCjh8TAyUnBtWvRDRnJk/qUPgjnqmsw/OgG6DfYE
-mMkV1BMZV5px72/UBV8DGn8/d/5ZtoGqugtL4hZe9jzWzh3fmokMPkeYZF1COKsT
-89kGQOoLy00QmZsSNR2nuJb3Omh5yGg3KX0cueDfLXfjE6N4GVyDPqwDRvfiZhCT
-10dOebwVzgeO7cPel7Vdxhfs1U0vEwh1q54Bd8k2r2vyXDBWsyWlSWRnBoRUZ1fY
-NdmMsnEC+ANjbpBezqTh/77C4N15PLZ4shEleXG2v4AZLQ1OKSU295sEM1w3Z8oL
-V5w5KxwZsw1hQ9DoPOf5oVikbRrzzRgEZQiXmykTAa6nVu74yKB71mfRAEOxLKZc
-lkzIBBd9b5vjpZqHWZe/hKnSZ2kL0Xi+NlcZyMvh3k1Y7jEOXxrknvJkC38HRibw
-xzSjbP7+vuCIUMXURcioH21yVaIV+03fOM4Ap4f75gb5yOY6a4pqBklkQN5yRN7a
-RwlIpcujeRdLGvWRoF7Fz+NZ3yhR09HGpsKfl1bc906wDdCFLBxVtSkConi5GdNl
-Z4fJnaRvtIbxdZWoWBDDHjmycHNsWTljlnODPHfmAsLy4VcUksMpQU863s7VV6Re
-GCNGZmrjsF3f9vlFCTYwN62kyLDkkdVPvWbZM3tuUMwU1odv83Ta77kCDQRbuAXq
+Nb1KUcSyEADrFQnwjR5sHgUCw6kjxgldOt3yiT/H7oMmZxTAn8h3N3M+HR4XQfHI
+FcD4YL24pzDxNBF2y7dHIYjRof+8JjgDnmV0bxXfiPtfqpyN64qUYoS7pIK50qU6
+IHcMv4+3PYv6rfY8F+gWonQDXUfH7fMLq9NGhxKW+2xt3Tm4sCv8EtpINtu2Obry
+ZGThNJyTYwsDWgFxb6xddpbqitt6GEdrUD18Cjg0j4IaQMSMr/qLgw31fzsNtsVU
+Nh6h3aYs1lTYs5kq0QfAx/ehKbZ8Ni6z9hS5DpB9+F6jRU5QjbbJlsuTds0/SbHL
+jHfv1ZdUVDOkubpoPhjjBf2HsumUpMP5HOh+eSYOmN3D42B7kWaRX9Jz5yv9fSK2
+AuUadVQFAXtn4BP5pO0gjGfjLNOH7DDeKZq8UnlHxjlQwiS+n+c46vLWXHep4XG9
+70kWwSdi+AvfyLSgYkpVzpyT2RIitkV+iycXZ5N/OiMXffesJVrGgxBKWkd+uTrM
+ihvW7C1zUeFxg3n4Cadmhzjy7AF3PIgiJCy1dy9YOIWfA5rj/EOhOFHVX1bO7xMK
+DsqwLzbuCJ+fnnmg86DJMsaYk2srevppJeOOarA7wsf2mF2vM0DnaXuetVuGaXJu
+DwfOnJAxU2z40l7AyzNzUlgox85AeWHsF6E9AWC6D4OmM+cUVLKLNrkCDQRbuAXq
 ARAAv7cb/kgE1sQD4hmtWrbuJrMsZz2kWwYY37atxWstQAr2CEIvFLlENV3nRaGF
 5ZvOWcIHZrYRcMQDh1tvxLuL25KYlbvk5tXH5Jzg3Ihw6GbzaYo5Wmb6RoAAq7zr
 4C/qA0/CeEfMJrUr2pb79TPMVhYilvs9oLYF4193hQeQrq7U4qvNvQwXVEwN6fPh
@@ -97,18 +97,18 @@ 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
-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
+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
@@ -120,17 +120,17 @@ KtAkw9XA+8+nAI9czFlUgHnuMJAqw1IGOD3qozwqZ5yn1+kG7FZJRpvaPc5pK2Ht
 qaAKJmnRuVaWcFuNALh86gr7Qn8IEp8Q+YyKmDqrMZ4KLJUMnVqn4y0HVS1eB5nV
 ujaJZUGJWA4q3og0FE/2kH74WEp2ZtuJAoEPcgfZ6Ns7BmmXIZU7qu4kQoQ73b3m
 n6hCi5xlQ/sClzwHYkRPo4tST64ED/UIRPCYe1byNUWSwwARAQABiQI8BBgBCgAm
-AhsgFiEEX3gmG2XFZQQWYqO3/4/DxzW9SlEFAmYi5xEFCQxMFFcACgkQ/4/DxzW9
-SlHdcg//Xl52M5qrBStJFdGhWgp9p26B/jvUTGNuTBN6XjTnk2PaphJ4mqHOjctD
-L3+flJi5LvZsJO3iaLe3o/6zalN5cveVUXcy7JPV9pdFu3m1NZq9hB2A7tUgun43
-lLHv6QhgygCtYSqANQ7EamgSlHx2EOg45x4+MYbmezTpn5+0E8n1D8R+c65w93bE
-nVfNR8zDCpVTSsOkYPfOWp1GyE51xLUcDPaz0GoVg/byh0wu38A83r8Ku0cjHu8k
-et4Dm7w1RYwBofR+HiR6FVcPpbPAFFYk6uZcKl1+m11hAkByMNXjchrmkYD44A2Y
-OvQIrv7HL7kHnsceKCD3NklQXeTNiz1IBSaqqNMB6ijZ+DHil95NNVbo9aJlx6NC
-39eD82Pa/6zFERhJvljNU+9rKPihsITS13g9SJCcWjQ1txNwj5vkrg+okaGINfnh
-QgAUCXqzFLk47O5XLT31HYTsHU04R1fsbVI3HKa4Zy4XCneagFDLWZC77xyPCRu2
-BCCkmlg7SEMnuOv7NO4oypJSwFr+l4R6mo01hXzB4uYAXVf6DfDhJDkHHTLVWWZT
-3nGIc/WnNMBRjhM7E2C8icAwEWMDUdUeD8BBhDruO6QwekXxYhjR21szqTbv1yob
-UtZ3QsbcSwZfGKS1RofT6gdKMvjfx/aeM4JjATwU+3DOjnrZdwE=
-=iAtF
+AhsgFiEEX3gmG2XFZQQWYqO3/4/DxzW9SlEFAmgyEyoFCQ5bQGQACgkQ/4/DxzW9
+SlFzGRAAmKDdJtwtiqpXQcKMXT5+UVIb/pL4DM6m7auv2q3Pd07onMoA6YVbDb+e
+/vFaUDsbo823JucYN+Y6zNCeV9vraTasR8mMuq7omYn7aTOXDJ7kKc0kAAO8e+H6
+pbjLDPydpBJrG2N5C4gHX8Fs+R+Ab96JwL3bgVElWtTN9jMFeQNsMjPVFRAVjhLX
+wtgt+1UxQHEDeK0zQFCw4jmx5AYL0Gy6sYRLWOI9GBpQijIKTmldVoIjU32Swsxo
+saAD2eUPK/DBJ6+ORq1mM2kupGpsgvkSQZkCpenl+pI+Wjl78CxnRZlTs/WVfHZE
+hEQ+rmrPJfiLk+717FJoDqFokloJciJP3ELXi/wHoZGAf8hH3QQvuyEnWmPsefWx
+IoRbe7dHVXT/MLX8MLWHHeIppy9dvQF6sSD5XLz4XTe9hGSGBYNq2Qi64kwQ05Hw
+pu0M0NbdrG2ywoMh9WZ3bEljOoVxREJV0vYXBFUamiFzDULZxBHjhasNhG9XihYU
+eyzYVoEnjd60gebtWrrTPeBVTqOc7GNa2ZtYZ38aZ2wD6RDcXm6JkCLMIA6vIkvw
+8q5vVHG7VrYnKS6T373VfMT4hjO0Fwrpp5PX+UA45JKPQ5MzVr8n7KfamONgqJWw
+C7hSdQnaivWUCSz7tem9uLF2Sh19aI07KtkLzRwySM5MhB1lJUY=
+=PwkH
 -----END PGP PUBLIC KEY BLOCK-----