2020-06-02, Version 10.21.0 'Dubnium' (LTS)v10.21.0

This is a security release.

Vulnerabilities fixed:

- CVE-2020-8174: napi_get_value_string_*() allows various kinds of
                 memory corruption (High).
- CVE-2020-10531: ICU-20958 Prevent SEGV_MAPERR in append (High).
- CVE-2020-11080: HTTP/2 Large Settings Frame DoS (Low).

PR-URL: https://github.com/nodejs-private/node-private/pull/211

4 files changed, 30 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91be65a7109..08148a7116e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V12.md#12.0.0">12.0.0</a><br/>
     </td>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V10.md#10.20.1">10.20.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V10.md#10.21.0">10.21.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V10.md#10.20.1">10.20.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.20.0">10.20.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.19.0">10.19.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.18.1">10.18.1</a><br/>
diff --git a/doc/api/http2.md b/doc/api/http2.md
index c3b4e67f3ea..bb0ac52dd8f 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -1900,7 +1900,7 @@ error will be thrown.
 <!-- YAML
 added: v8.4.0
 changes:
-  - version: REPLACEME
+  - version: v10.21.0
     pr-url: https://github.com/nodejs-private/node-private/pull/204
     description: Added `maxSettings` option with a default of 32.
   - version: v8.9.3
@@ -2015,7 +2015,7 @@ server.listen(80);
 <!-- YAML
 added: v8.4.0
 changes:
-  - version: REPLACEME
+  - version: v10.21.0
     pr-url: https://github.com/nodejs-private/node-private/pull/204
     description: Added `maxSettings` option with a default of 32.
   - version: v10.12.0
@@ -2122,7 +2122,7 @@ server.listen(80);
 <!-- YAML
 added: v8.4.0
 changes:
-  - version: REPLACEME
+  - version: v10.21.0
     pr-url: https://github.com/nodejs-private/node-private/pull/204
     description: Added `maxSettings` option with a default of 32.
   - version: v8.9.3
diff --git a/doc/changelogs/CHANGELOG_V10.md b/doc/changelogs/CHANGELOG_V10.md
index 7be89abbcec..fb4b94bf96d 100644
--- a/doc/changelogs/CHANGELOG_V10.md
+++ b/doc/changelogs/CHANGELOG_V10.md
@@ -10,6 +10,7 @@
 </tr>
 <tr>
 <td valign="top">
+<a href="#10.21.0">10.21.0</a><br/>
 <a href="#10.20.1">10.20.1</a><br/>
 <a href="#10.20.0">10.20.0</a><br/>
 <a href="#10.19.0">10.19.0</a><br/>
@@ -61,6 +62,27 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="10.21.0"></a>
+## 2020-06-02, Version 10.21.0 'Dubnium' (LTS), @BethGriggs
+
+### Notable changes
+
+This is a security release.
+
+Vulnerabilities fixed:
+
+* **CVE-2020-8174**: napi_get_value_string_*() allows various kinds of memory corruption (High).
+* **CVE-2020-10531**: ICU-20958 Prevent SEGV_MAPERR in append (High).
+* **CVE-2020-11080**: HTTP/2 Large Settings Frame DoS (Low).
+
+### Commits
+
+* [[`0ad7970256`](https://github.com/nodejs/node/commit/0ad7970256)] - **deps**: fix OPENSSLDIR on Windows (Shigeki Ohtsu) [#29456](https://github.com/nodejs/node/pull/29456)
+* [[`bd78c6ea46`](https://github.com/nodejs/node/commit/bd78c6ea46)] - **deps**: backport ICU-20958 to fix CVE-2020-10531 (Richard Lau) [#33572](https://github.com/nodejs/node/pull/33572)
+* [[`33e9a12241`](https://github.com/nodejs/node/commit/33e9a12241)] - **(SEMVER-MINOR)** **deps**: update nghttp2 to 1.41.0 (James M Snell) [nodejs-private/node-private#204](https://github.com/nodejs-private/node-private/pull/204)
+* [[`881c244a4e`](https://github.com/nodejs/node/commit/881c244a4e)] - **(SEMVER-MINOR)** **http2**: implement support for max settings entries (James M Snell) [nodejs-private/node-private#204](https://github.com/nodejs-private/node-private/pull/204)
+* [[`cd9827f105`](https://github.com/nodejs/node/commit/cd9827f105)] - **napi**: fix memory corruption vulnerability (Tobias Nießen) [nodejs-private/node-private#203](https://github.com/nodejs-private/node-private/pull/203)
+
 <a id="10.20.1"></a>
 ## 2020-04-12, Version 10.20.1 'Dubnium' (LTS), @BethGriggs
 
diff --git a/src/node_version.h b/src/node_version.h
index 2718e6550f7..4e55c453902 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -23,13 +23,13 @@
 #define SRC_NODE_VERSION_H_
 
 #define NODE_MAJOR_VERSION 10
-#define NODE_MINOR_VERSION 20
-#define NODE_PATCH_VERSION 2
+#define NODE_MINOR_VERSION 21
+#define NODE_PATCH_VERSION 0
 
 #define NODE_VERSION_IS_LTS 1
 #define NODE_VERSION_LTS_CODENAME "Dubnium"
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)