From 83c7a8897c644e1eadeaaace4863a822c73359a0 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 18 Oct 2016 19:58:58 +1100
Subject: [PATCH] 2016-10-18, Version 4.6.1 'Argon' (LTS)

This is a security release. All Node.js users should consult the security
release summary at
https://nodejs.org/en/blog/vulnerability/october-2016-security-releases/
for details on patched vulnerabilities.

Notable changes:

* c-ares: fix for single-byte buffer overwrite, CVE-2016-5180, more
  information at https://c-ares.haxx.se/adv_20160929.html (Daniel Stenberg)

PR-URL: https://github.com/nodejs/node/pull/9153
---
 CHANGELOG.md                   |  3 ++-
 doc/changelogs/CHANGELOG_V4.md | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdd39780fa..c90f1fe05e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,7 +61,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V5.md#5.0.0">5.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V4.md#4.6.0">4.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V4.md#4.6.1">4.6.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.6.0">4.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.5.0">4.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.7">4.4.7</a></b>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.6">4.4.6</a></b>
diff --git a/doc/changelogs/CHANGELOG_V4.md b/doc/changelogs/CHANGELOG_V4.md
index 8ce1fdcfba..84ed033ad7 100644
--- a/doc/changelogs/CHANGELOG_V4.md
+++ b/doc/changelogs/CHANGELOG_V4.md
@@ -7,6 +7,7 @@
 </tr>
 <tr>
 <td valign="top">
+<a href="#4.6.1">4.6.1</a><br/>
 <a href="#4.6.0">4.6.0</a><br/>
 <a href="#4.5.0">4.5.0</a><br/>
 <a href="#4.4.7">4.4.7</a><br/>
@@ -50,6 +51,20 @@
 [Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
 will be supported actively until April 2017 and maintained until April 2018.
 
+<a id="4.6.1"></a>
+## 2016-10-18, Version 4.6.1 'Argon' (LTS), @rvagg
+
+This is a security release. All Node.js users should consult the security release summary at https://nodejs.org/en/blog/vulnerability/october-2016-security-releases/ for details on patched vulnerabilities.
+
+### Notable Changes
+
+* **c-ares**: fix for single-byte buffer overwrite, CVE-2016-5180, more information at https://c-ares.haxx.se/adv_20160929.html (Daniel Stenberg)
+
+### Commits
+
+* [[`f3c63e7ccf`](https://github.com/nodejs/node/commit/f3c63e7ccf)] - **deps**: avoid single-byte buffer overwrite (Daniel Stenberg) [#8849](https://github.com/nodejs/node/pull/8849)
+* [[`5a0daa6c2f`](https://github.com/nodejs/node/commit/5a0daa6c2f)] - **win,build**: try multiple timeservers when signing (Rod Vagg) [#9155](https://github.com/nodejs/node/pull/9155)
+
 <a id="4.6.0"></a>
 ## 2016-09-27, Version 4.6.0 'Argon' (LTS), @rvagg