From 2a5f7891413b718714a421886c1ecb495a973cf9 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Thu, 22 Dec 2016 01:50:07 +1100
Subject: [PATCH] 2016-12-21 Version 0.12.18 (Maintenance) Release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Notable changes:

* npm: upgrade from v2.15.1 to v2.15.11, including accurate updated license (Jeremiah Senkpiel)
* process: `process.versions.ares` now outputs the c-ares version (Johan Bergström)

PR-URL: https://github.com/nodejs/node/pull/10352
---
 CHANGELOG.md                     |  3 ++-
 doc/changelogs/CHANGELOG_V012.md | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b118f9987..96706be242 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,7 +102,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V4.md#4.0.0">4.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.17">0.12.17</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.18">0.12.18</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V012.md#0.12.17">0.12.17</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.16">0.12.16</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.15">0.12.15</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.14">0.12.14</a><br/>
diff --git a/doc/changelogs/CHANGELOG_V012.md b/doc/changelogs/CHANGELOG_V012.md
index f9315e510e..cbacd47f69 100644
--- a/doc/changelogs/CHANGELOG_V012.md
+++ b/doc/changelogs/CHANGELOG_V012.md
@@ -6,6 +6,7 @@
 </tr>
 <tr>
 <td>
+<a href="#0.12.18">0.12.18</a><br/>
 <a href="#0.12.17">0.12.17</a><br/>
 <a href="#0.12.16">0.12.16</a><br/>
 <a href="#0.12.15">0.12.15</a><br/>
@@ -41,6 +42,24 @@
 [Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
 will be maintained until December 31st, 2016.
 
+<a id="0.12.18"></a>
+## 2016-12-21, Version 0.12.18 (Maintenance), @rvagg
+
+### Notable changes:
+
+* npm: upgrade from v2.15.1 to v2.15.11, including accurate updated license (Jeremiah Senkpiel)
+* process: `process.versions.ares` now outputs the c-ares version (Johan Bergström)
+
+### Commits:
+
+* [a47fd4549d] - build: add working lint-ci make target (Rod Vagg) https://github.com/nodejs/node/pull/9151
+* [830584ca59] - deps: define missing operator delete functions (John Barboza) https://github.com/nodejs/node/pull/10356
+* [c130b31cba] - deps: upgrade npm to 2.15.11 (Jeremiah Senkpiel) https://github.com/nodejs/node/pull/9619
+* [bc6766d847] - doc: update npm license in main LICENSE file (Rod Vagg) https://github.com/nodejs/node/pull/10352
+* [0cdf344c80] - (SEMVER-MINOR) process: reintroduce ares to versions (Johan Bergström) https://github.com/nodejs/node/pull/9191
+* [d8e27ec30a] - test: mark dgram-multicast-multi-process as flaky (Rod Vagg) https://github.com/nodejs/node/pull/9150
+* [c722335ead] - tls: fix minor jslint failure (Rod Vagg) https://github.com/nodejs/node/pull/9107
+
 <a id="0.12.17"></a>
 ## 2016-10-18, Version 0.12.17 (Maintenance), @rvagg