From 9fb7f481e3d09d3b3658cb78bd75c4910fff8c0a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 10 Mar 2010 00:17:35 -0500
Subject: update zimmermann changelog about minor MS config change to the
 keyserver

---
 doc/zimmermann/changelog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc/zimmermann')

diff --git a/doc/zimmermann/changelog b/doc/zimmermann/changelog
index 8dedf58..3ad3903 100644
--- a/doc/zimmermann/changelog
+++ b/doc/zimmermann/changelog
@@ -7,6 +7,10 @@
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
 
+2010-03-10 - micah
+	* Updated /etc/monkeysphere/*.conf to use zimmermann
+	for the keyserver
+
 2008-11-29 - dkg
 	* zimmermann now uses an X.509 certificate signed by the MF/PL CA
 	for its HTTPS connection.
-- 
cgit v1.2.3


From f49a056587718a95df2c65d47ceeef2b84334016 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 10 Mar 2010 00:29:43 -0500
Subject: retroactively added notes to changelog for zimmermann

---
 doc/zimmermann/changelog | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'doc/zimmermann')

diff --git a/doc/zimmermann/changelog b/doc/zimmermann/changelog
index 3ad3903..f3e8171 100644
--- a/doc/zimmermann/changelog
+++ b/doc/zimmermann/changelog
@@ -11,10 +11,28 @@
 	* Updated /etc/monkeysphere/*.conf to use zimmermann
 	for the keyserver
 
+2010-03-09 - dkg
+	* transferred the https://z.m.o key from /root/.gnupg into the
+	monkeysphere-host keyring with:
+
+         gpg --export-secret-keys | GNUPGHOME=/var/lib/monkeysphere/host gpg --import
+
+	* used undocumented "monkeysphere-host update-pgp-pub-file" to
+	refresh the output of m-h s.
+
+2010-02-19 - dkg
+	* upgraded to monkeysphere 0.28-1~bpo50+1 (includes gnupg from
+	backports.org)
+
+2010-02-?? - dkg
+	* manually created an OpenPGP certificate for zimmermann's https
+	RSA key, stored in /root/.gnupg; published it to the keyserver
+	network, certified it myself.
+
 2008-11-29 - dkg
 	* zimmermann now uses an X.509 certificate signed by the MF/PL CA
 	for its HTTPS connection.
-	
+
 2008-11-19 - dkg
 	* added 10 SKS peers as a result of feedback from sks-devel.
 	* set localtime to America/New_York via dpkg-reconfigure tzdata
@@ -24,7 +42,7 @@
 	* made nginx proxy plain ol' HTTP on port 80 also so that SKS does
 	not need to try to listen on a privileged port.
 	* turned on initial_stat and stat_hour: 3 in /etc/sks/sksconf
-	
+
 2008-11-19 - mlc
 	* aptitude install nginx
 	* get rid of /etc/nginx/sites-enabled/default
-- 
cgit v1.2.3