aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <[email protected]>2012-04-02 07:06:24 -0700
committerPieter Wuille <[email protected]>2012-04-02 07:06:24 -0700
commit811bde826728120a7563b1415de2e72c569bde45 (patch)
treef5588440611636740db92b5dcefa7461ee0f978e
parentBump version to 0.6.0.99 for 0.6.1 merge window (diff)
parentUpdated my GPG key (diff)
downloaddiscoin-811bde826728120a7563b1415de2e72c569bde45.tar.xz
discoin-811bde826728120a7563b1415de2e72c569bde45.zip
Merge pull request #1018 from sipa/gpg
Updated my GPG key
-rw-r--r--contrib/gitian-downloader/linux-download-config2
-rw-r--r--contrib/gitian-downloader/sipa-key.pgpbin13642 -> 108922 bytes
-rw-r--r--contrib/gitian-downloader/win32-download-config2
3 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config
index 36f5f682a..9a570a1dc 100644
--- a/contrib/gitian-downloader/linux-download-config
+++ b/contrib/gitian-downloader/linux-download-config
@@ -17,7 +17,7 @@ signers:
key: devrandom
D762373D24904A3E42F33B08B9A408E71DAAC974:
weight: 40
- name: Sipa
+ name: "Pieter Wuille"
key: sipa
77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
weight: 40
diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp
index 086c9eb42..a52a5deb1 100644
--- a/contrib/gitian-downloader/sipa-key.pgp
+++ b/contrib/gitian-downloader/sipa-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config
index b1e1c7399..3974d6155 100644
--- a/contrib/gitian-downloader/win32-download-config
+++ b/contrib/gitian-downloader/win32-download-config
@@ -17,7 +17,7 @@ signers:
key: devrandom
D762373D24904A3E42F33B08B9A408E71DAAC974:
weight: 40
- name: Sipa
+ name: "Pieter Wuille"
key: sipa
77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
weight: 40