Merge branch 'v0.10.40-release' into v0.10

10 years ago · 26bb1ad137
3 changed files with 12 additions and 2 deletions
--- a/1
+++ b/1
@ -534,3 +534,4 @@ Paulo McNally <paulomcnally@gmail.com>
 AlexKVal <alexkval@gmail.com>
 João Reis <reis@janeasystems.com>
 Mathias Küsel <mathiask@hotmail.de>
+Steven Rockarts <srockarts@invidi.com>
--- a/11
+++ b/11
@ -1,4 +1,13 @@
-2015.06.18, Version 0.10.39 (Maintenance)
+2015.07.09, Version 0.10.40 (Maintenance)
+
+* openssl: upgrade to 1.0.1p
+
+* V8: back-port JitCodeEvent patch from upstream (Ben Noordhuis)
+
+* win,msi: create npm folder in AppData directory (Steven Rockarts)
+
+
+2015.06.18, Version 0.10.39 (Maintenance), 615a35ccd2cb5cba80901862aefe51a940995f44

 * openssl: upgrade to 1.0.1o (Addressing multiple CVEs)

--- a/src/node_version.h
+++ b/src/node_version.h
@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 40

-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1

 #ifndef NODE_TAG
 # define NODE_TAG ""