Merge remote-tracking branch 'upstream/v0.10' into v0.12

Conflicts: ChangeLog src/node_version.h
nodejs · Mar 24, 2015 · a0ce9cc · a0ce9cc
2 parents e80bcf5 + 7edfd5f
commit a0ce9cc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -953,7 +953,12 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
 
 
-2015.03.11, Version 0.10.37 (Maintenance)
+2015.03.23, Version 0.10.38 (Maintenance)
+
+* openssl: upgrade to 1.0.1m (Addressing multiple CVEs)
+
+
+2015.03.11, Version 0.10.37 (Maintenance), 7d6b5b1d5ba726331f9ccaaae59af7cd53eee82e
 
 * uv: update to 0.10.36 (CVE-2015-0278)