[pull] master from nodejs:master

CHANGELOG.md

@@ -56,7 +56,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V13.md#13.0.0">13.0.0</a><br/>
     </td>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V12.md#12.16.3">12.16.3</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V12.md#12.17.0">12.17.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V12.md#12.16.3">12.16.3</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.16.2">12.16.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.16.1">12.16.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.16.0">12.16.0</a><br/>

doc/api/async_hooks.md

@@ -462,7 +462,9 @@ init for PROMISE with id 6, trigger id: 5  # the Promise returned by then()
 #### `async_hooks.executionAsyncResource()`
 
 <!-- YAML
-added: v13.9.0
+added:
+ - v13.9.0
+ - v12.17.0
 -->
 
 * Returns: {Object} The resource representing the current execution.
@@ -864,7 +866,9 @@ for (let i = 0; i < 10; i++) {
 
 ## Class: `AsyncLocalStorage`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 This class is used to create asynchronous state within callbacks and promise
@@ -913,15 +917,19 @@ from each other. It is safe to instantiate this class multiple times.
 
 ### `new AsyncLocalStorage()`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 Creates a new instance of `AsyncLocalStorage`. Store is only provided within a
 `run` method call.
 
 ### `asyncLocalStorage.disable()`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 This method disables the instance of `AsyncLocalStorage`. All subsequent calls
@@ -941,7 +949,9 @@ in the current process.
 
 ### `asyncLocalStorage.getStore()`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 * Returns: {any}
@@ -952,7 +962,9 @@ calling `asyncLocalStorage.run`, it will return `undefined`.
 
 ### `asyncLocalStorage.enterWith(store)`
 <!-- YAML
-added: v13.11.0
+added:
+ - v13.11.0
+ - v12.17.0
 -->
 
 * `store` {any}
@@ -994,7 +1006,9 @@ asyncLocalStorage.getStore(); // Returns the same object
 
 ### `asyncLocalStorage.run(store, callback[, ...args])`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 * `store` {any}
@@ -1029,7 +1043,9 @@ try {
 
 ### `asyncLocalStorage.exit(callback[, ...args])`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 * `callback` {Function}

doc/api/cli.md

@@ -128,8 +128,10 @@ added: v12.0.0
 Specify the file name of the CPU profile generated by `--cpu-prof`.
 
 ### `--disable-proto=mode`
-<!--YAML
-added: v13.12.0
+<!-- YAML
+added:
+ - v13.12.0
+ - v12.17.0
 -->
 
 Disable the `Object.prototype.__proto__` property. If `mode` is `delete`, the
@@ -628,7 +630,9 @@ warning will be written to stderr instead.
 
 ### `--report-compact`
 <!-- YAML
-added: v13.12.0
+added:
+ - v13.12.0
+ - v12.17.0
 -->
 
 Write reports in a compact format, single-line JSON, more easily consumable
@@ -639,7 +643,9 @@ human consumption.
 <!-- YAML
 added: v11.8.0
 changes:
-  - version: v13.12.0
+  - version:
+     - v13.12.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32242
     description: This option is no longer considered experimental.
   - version: v12.0.0
@@ -654,7 +660,9 @@ Location at which the report will be generated.
 <!-- YAML
 added: v11.8.0
 changes:
-  - version: v13.12.0
+  - version:
+     - v13.12.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32242
     description: This option is no longer considered experimental.
   - version: v12.0.0
@@ -672,6 +680,7 @@ changes:
   - version:
     - v14.0.0
     - v13.14.0
+    - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32496
     description: This option is no longer considered experimental.
   - version: v12.0.0
@@ -690,7 +699,9 @@ error.
 <!-- YAML
 added: v11.8.0
 changes:
-  - version: v13.12.0
+  - version:
+     - v13.12.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32242
     description: This option is no longer considered experimental.
   - version: v12.0.0
@@ -707,7 +718,9 @@ specified through `--report-signal`.
 <!-- YAML
 added: v11.8.0
 changes:
-  - version: v13.12.0
+  - version:
+     - v13.12.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32242
     description: This option is no longer considered experimental.
   - version: v12.0.0
@@ -723,7 +736,9 @@ Default signal is `SIGUSR2`.
 <!-- YAML
 added: v11.8.0
 changes:
-  - version: v13.12.0
+  - version:
+     - v13.12.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32242
     description: This option is no longer considered experimental.
   - version: v12.0.0
@@ -895,7 +910,9 @@ i.e. invoking `process.exit()`.
 
 ### `--trace-sigint`
 <!-- YAML
-added: v13.9.0
+added:
+ - v13.9.0
+ - v12.17.0
 -->
 
 Prints a stack trace on SIGINT.
@@ -983,7 +1000,9 @@ See `SSL_CERT_DIR` and `SSL_CERT_FILE`.
 
 ### `--use-largepages=mode`
 <!-- YAML
-added: v13.6.0
+added:
+ - v13.6.0
+ - v12.17.0
 -->
 
 Re-map the Node.js static code to large memory pages at startup. If supported on

doc/api/console.md

@@ -81,7 +81,9 @@ const { Console } = console;
 ### `new Console(options)`
 <!-- YAML
 changes:
-  - version: v14.2.0
+  - version:
+     - v14.2.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32964
     description: The `groupIndentation` option was introduced.
   - version: v11.7.0

doc/api/crypto.md

@@ -1233,7 +1233,9 @@ passing keys as strings or `Buffer`s due to improved security features.
 <!-- YAML
 added: v11.6.0
 changes:
-  - version: v13.9.0
+  - version:
+     - v13.9.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/31178
     description: Added support for `'dh'`.
   - version: v12.0.0
@@ -2096,7 +2098,9 @@ algorithm names.
 
 ### `crypto.diffieHellman(options)`
 <!-- YAML
-added: v13.9.0
+added:
+ - v13.9.0
+ - v12.17.0
 -->
 
 * `options`: {Object}
@@ -2112,7 +2116,9 @@ Both keys must have the same `asymmetricKeyType`, which must be one of `'dh'`
 <!-- YAML
 added: v10.12.0
 changes:
-  - version: v13.9.0
+  - version:
+     - v13.9.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/31178
     description: Add support for Diffie-Hellman.
   - version: v12.0.0
@@ -2185,7 +2191,9 @@ a `Promise` for an `Object` with `publicKey` and `privateKey` properties.
 <!-- YAML
 added: v10.12.0
 changes:
-  - version: v13.9.0
+  - version:
+     - v13.9.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/31178
     description: Add support for Diffie-Hellman.
   - version: v12.0.0

doc/api/dns.md

@@ -202,7 +202,9 @@ is not set to `true`, it returns a `Promise` for an `Object` with `address` and
 ### Supported getaddrinfo flags
 <!-- YAML
 changes:
-  - version: v13.13.0
+  - version:
+     - v13.13.0
+     - v12.17.0
     pr-url: https://github.com/nodejs/node/pull/32183
     description: Added support for the `dns.ALL` flag.
 -->

doc/api/errors.md

@@ -1905,7 +1905,9 @@ The context must be a `SecureContext`.
 <a id="ERR_TLS_INVALID_STATE"></a>
 ### `ERR_TLS_INVALID_STATE`
 <!-- YAML
-added: v13.10.0
+added:
+ - v13.10.0
+ - v12.17.0
 -->
 
 The TLS socket must be connected and securily established. Ensure the 'secure'

doc/api/events.md

@@ -366,7 +366,7 @@ Its `name` property is set to `'MaxListenersExceededWarning'`.
 <!-- YAML
 added:
  - v13.6.0
- - v12.16.0
+ - v12.17.0
 -->
 
 This symbol shall be used to install a listener for only monitoring `'error'`