From fb258f88b4b61627a51f30f9a21fcbc7ec35c1e6 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Wed, 30 Sep 2015 14:18:24 -0700
Subject: Changelog closes #490, closes #500 (cherry-pick)

---
 sites/www/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sites/www')

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 3c11ff87..5f6a16f9 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :bug:`490` Skip invalid/unparseable lines in ``known_hosts`` files, instead
+  of raising `SSHException`. This brings Paramiko's behavior more in line with
+  OpenSSH, which silently ignores such input. Catch & patch courtesy of Martin
+  Topholm.
 * :bug:`404` Print details when displaying `BadHostKeyException` objects
   (expected vs received data) instead of just "hey shit broke". Patch credit:
   Loic Dachary.
-- 
cgit v1.2.3