# HG changeset patch
# User Jeff Forcier <jeff@bitprophet.org>
# Date 1379713649 25200
#      Fri Sep 20 14:47:29 2013 -0700
# Node ID 07c47b48ca1c692d74bff6c2ba067d56ff137835
# Parent  a290fa3e58e96eba459d4d729ad419e6c6c77101
Copy some 1.10.3 changes to 1.11.1 changelog

diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,10 @@
 * #162: Clean up HMAC module import to avoid deadlocks in certain uses of
   SSHClient. Thanks to Gernot Hillier for the catch & suggested
   fix.
+* #168: Update config handling to properly handle multiple 'localforward' and
+  'remoteforward' keys. Thanks to Emre Yılmaz for the patch.
+* #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to
+  Jonathan Halcrow for catch & patch.
 
 v1.10.3 (20th Sep 2013)
 -----------------------