summaryrefslogtreecommitdiff
path: root/packaging/debian
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2008-11-16 03:22:18 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2008-11-16 03:22:18 -0500
commit5d9949335aeb1dec04f530cbb3dfcac24288706a (patch)
treee4c81a45e2dcfdd46409beab222d122751f5f6d7 /packaging/debian
parentdd002c89fc4dccabc16d488a15a40cc88383605f (diff)
parentd056cc64effacd7936fddb6e696957868fff7eed (diff)
Merge commit 'dkg/master'
Conflicts: packaging/debian/changelog
Diffstat (limited to 'packaging/debian')
-rw-r--r--packaging/debian/changelog12
1 files changed, 10 insertions, 2 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index e8ea1a9..3b7432b 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,11 +1,19 @@
-monkeysphere (0.22-1) UNRELEASED; urgency=low
+monkeysphere (0.22~pre-1) UNRELEASED; urgency=low
* New upstream release:
+ [ Jameson Rollins ]
+
- added info log output when a new key is added to known_hosts file.
- added some useful output to the ssh-proxycommand for "marginal"
cases where keys are found for host but do not have full validity.
- -- Jameson Graef Rollins <jrollins@finestructure.net> Sun, 16 Nov 2008 03:17:16 -0500
+ [ Daniel Kahn Gillmor ]
+
+ - automatically output two copies of the host's public key: one
+ standard ssh public key file, and the other a minimal OpenPGP key with
+ just the latest valid self-sig.
+
+ -- Jameson Graef Rollins <jrollins@finestructure.net> Sun, 16 Nov 2008 03:22:08 -0500
monkeysphere (0.21-2) unstable; urgency=low