summaryrefslogtreecommitdiffhomepage
path: root/NEWS
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-09-20 18:10:04 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-09-20 18:10:04 -0700
commit2ef0ab9f6a69fcc50aa598e26982246c3ade2b40 (patch)
tree1d0d92908fb6174c0f15c3ed23d860201639349b /NEWS
parentb9629f0fd637879209601890582455762ecb378a (diff)
parentf783d4d818dba93177ac96b95251e18fcfe190cc (diff)
Merge branch '1.11'
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 55981ddf..8affcd56 100644
--- a/NEWS
+++ b/NEWS
@@ -18,10 +18,10 @@ v1.11.1 (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.
-* #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.
+* #168: Update config handling to properly handle multiple 'localforward' and
+ 'remoteforward' keys. Thanks to Emre Yılmaz for the patch.
v1.10.3 (20th Sep 2013)
-----------------------