summaryrefslogtreecommitdiffhomepage
path: root/NEWS
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-09-20 14:47:09 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-09-20 14:47:09 -0700
commite2aa7c17b0d7938dbff1eb35cd09af25a92e5ab3 (patch)
tree7e7d8162cc79b24375c1b0578e4b7842058bce97 /NEWS
parent081b04116be29072695a54e52e74ca9879bf03f9 (diff)
parentdb9dfebca801efbfd3743d85d4f7916f3996f4f5 (diff)
Merge branch '1.10' into 1.11
Conflicts: NEWS
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 1c59a935..43d3af5a 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,10 @@ v1.10.3 (20th Sep 2013)
* #162: Clean up HMAC module import to avoid deadlocks in certain uses of
SSHClient. Thanks to Gernot Hillier for the catch & suggested
fix.
+* #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to
+ Jonathan Halcrow for catch & patch.
+* #168: Update config handling to properly handle multiple 'localforward' and
+ 'remoteforward' keys. Thanks to Emre Yılmaz for the patch.
v1.11.0 (26th Jul 2013)
-----------------------