From: Jameson Graef Rollins Date: Sun, 16 Nov 2008 08:22:18 +0000 (-0500) Subject: Merge commit 'dkg/master' X-Git-Tag: monkeysphere_0.22-1~23^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d9949335aeb1dec04f530cbb3dfcac24288706a;p=monkeysphere.git Merge commit 'dkg/master' Conflicts: packaging/debian/changelog --- 5d9949335aeb1dec04f530cbb3dfcac24288706a diff --cc packaging/debian/changelog index e8ea1a9,1aee7d1..3b7432b --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@@ -1,11 -1,17 +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 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 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 Sat, 15 Nov 2008 20:49:13 -0500 ++ -- Jameson Graef Rollins Sun, 16 Nov 2008 03:22:08 -0500 monkeysphere (0.21-2) unstable; urgency=low