aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-11-14 08:26:02 +0100
committerWladimir J. van der Laan <[email protected]>2015-11-14 08:26:07 +0100
commit44ac42e50d567b08d3cb3f3c5766588468ce5bbf (patch)
treea32e953caa8f6fde371324af2d8bf15e03c70270
parentMerge pull request #7013 (diff)
parentadd jonasschnellis key to git-verify-commits trusted-keys (diff)
downloaddiscoin-44ac42e50d567b08d3cb3f3c5766588468ce5bbf.tar.xz
discoin-44ac42e50d567b08d3cb3f3c5766588468ce5bbf.zip
Merge pull request #7004
a5bc8de add jonasschnellis key to git-verify-commits trusted-keys (Jonas Schnelli) 160c72a update jonasschnellis gpg key (Jonas Schnelli)
-rw-r--r--contrib/gitian-downloader/jonasschnelli-key.pgpbin2230 -> 6974 bytes
-rw-r--r--contrib/verify-commits/trusted-keys1
2 files changed, 1 insertions, 0 deletions
diff --git a/contrib/gitian-downloader/jonasschnelli-key.pgp b/contrib/gitian-downloader/jonasschnelli-key.pgp
index fe44c0fbd..3831eaea1 100644
--- a/contrib/gitian-downloader/jonasschnelli-key.pgp
+++ b/contrib/gitian-downloader/jonasschnelli-key.pgp
Binary files differ
diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys
index fcf2b98e7..a0d0f82db 100644
--- a/contrib/verify-commits/trusted-keys
+++ b/contrib/verify-commits/trusted-keys
@@ -4,3 +4,4 @@
AF8BE07C7049F3A26B239D5325B3083201782B2F
81291FA67D2C379A006A053FEAB5AF94D9E9ABE7
3F1888C6DCA92A6499C4911FDBA1A67379A1A931
+32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC