Merge branch 'v0.12.1-release' into v0.12

Conflicts: ChangeLog
nodejs · Mar 24, 2015 · 59d3f68 · 59d3f68
2 parents 7e9d2f8 + 0034086
commit 59d3f68
Show file tree

Hide file tree

Showing 1,141 changed files with 285,004 additions and 295,765 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2015.03.23, Version 0.12.1 (Stable)
+
+* openssl: upgrade to 1.0.1m (Addressing multiple CVES)
+
+
 2015.02.06, Version 0.12.0 (Stable), 2b18916ff054309a07408719b62e2b6a4f1e056a
 
 * npm: Upgrade to 2.5.1

diff --git a/deps/openssl/asm/x64-win32-masm/aes/vpaesni-x86_64.asm b/deps/openssl/asm/x64-win32-masm/aes/vpaesni-x86_64.asm
diff --git a/deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig b/deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig