chore: bump node to v12.14.1 (master) (#21703)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Electron Bot 2020-01-10 07:42:53 +13:00 committed by Shelley Vohr
parent f5e202a898
commit cfae97a64c
31 changed files with 269 additions and 218 deletions

View file

@ -8,10 +8,10 @@ The BoringSSL incompatibilities (OPENSSL_memdup) will be shimmed in and this sho
be removed when the associated update is rolled into Chromium.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index d7eff663a5d7465d33f53930868edca6cb89bf49..863b48c614b331fa93a511b21b997891159bb86e 100644
index 861d321d6170b25e874080d4c70dda201cab3248..ef96843c820a5361056022cea5546e94e5572918 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5264,17 +5264,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
@@ -5365,17 +5365,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
return false;
}