diff options
| author | glozow <gloriajzhao@gmail.com> | 2023-02-24 10:25:44 +0000 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2023-02-24 10:27:25 +0000 |
| commit | 6758bd7de75d65d08f9f588378b92a56cc79a49e (patch) | |
| tree | b72bada0a90b0b46bceabb16bb4ac20985d5c64b | |
| parent | cb25c21921c7e49cedd72bc753827eb909af7b71 (diff) | |
| parent | fab17f08e24f0db687dc25c5e10eb62293070048 (diff) | |
| download | bitcoin-6758bd7de75d65d08f9f588378b92a56cc79a49e.tar.xz | |
Merge bitcoin/bitcoin#27135: Remove MarcoFalke fingerprint, update trusted-git-root
fab17f08e24f0db687dc25c5e10eb62293070048 Revert "[contrib] verify-commits: Add MarcoFalke fingerprint" (MarcoFalke)
Pull request description:
This reverts commit fa243293343eb964bfee5b91cc52b91f16232ab6.
The commit may be signed by my key, but I haven't checked it. Also, I haven't checked the new `contrib/verify-commits/trusted-git-root`.
ACKs for top commit:
achow101:
ACK fab17f08e24f0db687dc25c5e10eb62293070048
glozow:
ACK fab17f08e2
Tree-SHA512: 485fb302f7e42704412afffd6c09a031f63df18f259b27282b8373d5bf95b0ec72426cec476d88bf23e793a6e1dae4c1df2059645961806e34b50448ebf1862a
| -rw-r--r-- | contrib/verify-commits/trusted-git-root | 2 | ||||
| -rw-r--r-- | contrib/verify-commits/trusted-keys | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/contrib/verify-commits/trusted-git-root b/contrib/verify-commits/trusted-git-root index efb6b9f7b4..7ec318e1ea 100644 --- a/contrib/verify-commits/trusted-git-root +++ b/contrib/verify-commits/trusted-git-root @@ -1 +1 @@ -8ef096d4f8e08ac691502e3fd34721a8bdfa9044 +437dfe1c26e752c280014a30f809e62c684ad99e diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys index eeafcdf205..94daf28b15 100644 --- a/contrib/verify-commits/trusted-keys +++ b/contrib/verify-commits/trusted-keys @@ -1,4 +1,3 @@ -B8B3F1C0E58C15DB6A81D30C3648A882F4316B9B E777299FC265DD04793070EB944D35F9AC3DB76A D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 152812300785C96444D3334D17565732E08E5E41 |