Merge pull request 'Add _xxfedexx_'s PGP key' (#456 ) from _xxfedexx_/wownero:master into master

Reviewed-on: https://git.wownero.com/wownero/wownero/pulls/456
Add _xxfedexx_'s PGP key
2023-01-30 21:40:06 +00:00 · 2023-01-30 15:06:20 +00:00 · 2023-01-12 07:39:49 +00:00 · 2023-01-12 09:19:28 +03:00 · 2023-01-12 03:22:44 +00:00
3 changed files with 15 additions and 2 deletions
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ Dates are provided in the format YYYY-MM-DD.
 | 160,777                       | 2019-11-20 | Gaping Goatse    | v0.7.0.0                | v0.7.1.0                    | Only allow >= 2 outputs, change to the block median used to calculate penalty, rct sigs in coinbase forbidden, 4 unlock time as protocol rule
 | -                             | 2020-06-28 | Hallucinogenic Hypnotoad  | v0.8.0.0                | v0.8.0.2                    | Dandelion++ support
 | 253,999                       | 2020-10-09 | Illiterate Illuminati  | v0.9.0.0                | v0.9.3.3                    | Dynamic coinbase unlock (up to 1 mo.), Deterministic unlock times, Enforce maximum coinbase amount, show_qr_code wallet command, CLSAG
-| 331,170                       | 2021-07-04 | Junkie Jeff  | v0.10.0.0               | v0.10.2.0                   | Bulletproofs+, Miner Block Header Signing, Vote by Block, Change coinbase unlock time to 1 day, Reset difficulty and switch back to Monero's difficulty algorithm
+| 331,170                       | 2021-07-04 | Junkie Jeff  | v0.10.0.0               | v0.10.2.1                   | Bulletproofs+, Miner Block Header Signing, Vote by Block, Change coinbase unlock time to 1 day, Reset difficulty and switch back to Monero's difficulty algorithm
 | XXX,XXX                       | 2023-XX-XX | Kunty Karen  | v0.11.0.0               | v0.11.0.0                   | View tags, fee changes, adjusted dynamic block weight algorithm, multisig security fixes, RPC broadcast node donation sub-address 

 X's indicate that these details have not been determined as of commit date.
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
-#define DEF_MONERO_VERSION "0.10.2.0"
+#define DEF_MONERO_VERSION "0.10.2.1"
 #define DEF_MONERO_RELEASE_NAME "Junkie Jeff"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
 #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@
--- a/utils/gpg_keys/_xxfedexx_.asc
+++ b/utils/gpg_keys/_xxfedexx_.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEY9UIIhYJKwYBBAHaRw8BAQdAQNW4+jegC72+h1Jng5HIZdcta8AXvLjqDbPu
+x04GMZ+0Cl94eGZlZGV4eF+IlgQTFggAPhYhBPC94xBR60fuh1lEdlD3mjln1k1F
+BQJj1QgiAhsDBQkDoBgOBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEFD3mjln
+1k1FuGwBANy7MDaZJhSAJaRYFBQ/axrcNYR54ZK99S+q2vWjQplMAP9hIujNCsVh
+5W1N1RdnU5H8C/2mu5UT5A0Qhhtrdc6ID7g4BGPVCCISCisGAQQBl1UBBQEBB0DN
+6gtj60hSEx0Q3wpBv//mcnGDhmZ6Y43J7lPABStXEwMBCAeIfgQYFggAJhYhBPC9
+4xBR60fuh1lEdlD3mjln1k1FBQJj1QgiAhsMBQkDoBgOAAoJEFD3mjln1k1Fu8sB
+AP5UEdCmHpkzgJUjghfs73Z0c8RKWhfbKVFsEAwbR4m3AQDk9qJVnkBPOy889kgk
+PUhwY4sWBBEEwc5uggucGpTiBQ==
+=bthi
+-----END PGP PUBLIC KEY BLOCK-----
Author	SHA1	Message	Date
w0wΔri0	7ebc61b71f	Merge pull request 'Add _xxfedexx_'s PGP key' (#456 ) from _xxfedexx_/wownero:master into master Reviewed-on: https://git.wownero.com/wownero/wownero/pulls/456	2023-01-30 21:40:06 +00:00
_XxFedexX_	e9f9244e0d	Add _xxfedexx_'s PGP key	2023-01-30 15:06:20 +00:00
wowario	301e33520c	Merge pull request 'bump version' (#439 ) from wowario/wownero:tag-release-1 into master Reviewed-on: https://git.wownero.com/wownero/wownero/pulls/439	2023-01-12 07:39:49 +00:00
wowario	2285e6640a	bump version	2023-01-12 09:19:28 +03:00
dsc	cf3bba3aee	Merge pull request 'wowletify' (#438 ) from wowletify into master Reviewed-on: https://git.wownero.com/wownero/wownero/pulls/438	2023-01-12 03:22:44 +00:00