From 469a4a5091a677df62be319675056b869c31b35c Mon Sep 17 00:00:00 2001
From: Timothy J Fontaine <tjfontaine@gmail.com>
Date: Wed, 21 Aug 2013 15:00:56 -0700
Subject: [PATCH] 2013.08.21, Version 0.10.17 (Stable)

* uv: Upgrade v0.10.14

* http_parser: Do not accept PUN/GEM methods as PUT/GET (Chris Dickinson)

* tls: fix assertion when ssl is destroyed at read (Fedor Indutny)

* stream: Throw on 'error' if listeners removed (isaacs)

* dgram: fix assertion on bad send() arguments (Ben Noordhuis)

* readline: pause stdin before turning off terminal raw mode (Daniel Chatfield)
---
 AUTHORS            |  5 +++++
 ChangeLog          | 17 ++++++++++++++++-
 src/node_version.h |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a9e2730a8c9a5e..ffe022051ceb20 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -461,3 +461,8 @@ Andrew Chilton <andychilton@gmail.com>
 Wyatt Preul <wpreul@gmail.com>
 Forrest L Norvell <ogd@aoaioxxysz.net>
 Eran Hammer <eran@hueniverse.com>
+Daniel Chatfield <chatfielddaniel@gmail.com>
+Eivind Uggedal <eivind@uggedal.com>
+Edward Hutchins <eahutchins@gmail.com>
+Chris Wren <cthewren@gmail.com>
+Duan Yao <duanyao@ustc.edu>
diff --git a/ChangeLog b/ChangeLog
index 5ffd8a4fe77bbd..dcc2f3e5454238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-2013.08.16, Version 0.10.16 (Stable)
+2013.08.21, Version 0.10.17 (Stable)
+
+* uv: Upgrade v0.10.14
+
+* http_parser: Do not accept PUN/GEM methods as PUT/GET (Chris Dickinson)
+
+* tls: fix assertion when ssl is destroyed at read (Fedor Indutny)
+
+* stream: Throw on 'error' if listeners removed (isaacs)
+
+* dgram: fix assertion on bad send() arguments (Ben Noordhuis)
+
+* readline: pause stdin before turning off terminal raw mode (Daniel Chatfield)
+
+
+2013.08.16, Version 0.10.16 (Stable), 50b4c905a4425430ae54db4906f88982309e128d
 
 * v8: back-port fix for CVE-2013-2882
 
diff --git a/src/node_version.h b/src/node_version.h
index 6853f1e33d439c..2177244cd0cbe2 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 17
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""