summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-08-15 12:11:01 -0400
committerMicah Anderson <micah@riseup.net>2008-08-15 12:11:01 -0400
commit1c1d84bc446cc6d55ba4cd5efc7f5a6c3573fa93 (patch)
treeb46c469366d1dfba988d2eac697133c8425954f5 /debian
parent4dc13cb9a6c5a82e31875d8b69f060c9eab0cf8f (diff)
parentcb45bed4fce593770b4378fbb13e68cf3b68137a (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f6b69f8..160d1d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,14 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
* More monkeysphere-server diagnostics
* monkeysphere --gen-subkey now guesses what KeyID you meant.
- -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Thu, 07 Aug 2008 13:31:14 -0400
+ [ Jameson Graef Rollins ]
+ * fix another bug for when ssh key files are missing.
+ * sort processed keys so that "good" keys are processed after "bad"
+ keys. This will prevent malicious bad keys from causing good keys to
+ be removed from key files.
+ * enabled host key publication.
+
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Fri, 15 Aug 2008 00:48:22 -0700
monkeysphere (0.7-1) experimental; urgency=low