Merge remote branch 'dkg/master'

1 files changed, 24 insertions, 2 deletions

diff --git a/doc/zimmermann/changelog b/doc/zimmermann/changelog
index 8dedf58..f3e8171 100644
--- a/doc/zimmermann/changelog
+++ b/doc/zimmermann/changelog
@@ -7,10 +7,32 @@
 *  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
+
+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
@@ -20,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