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

Julien Gilli · Julien Gilli · commit 3a1d4b725762 · 2015-06-22T09:45:28.000-07:00
diff --git a/AUTHORS b/AUTHORS
@@ -530,3 +530,7 @@ Amir Saboury <amir.saboury@gmail.com>
 Florin-Cristian Gavrila <cristi_gavrila1@yahoo.com>
 Tyler Anton <mtyleranton@gmail.com>
 Jonas Dohse <jonas@dohse.ch>
+Paulo McNally <paulomcnally@gmail.com>
+AlexKVal <alexkval@gmail.com>
+João Reis <reis@janeasystems.com>
+Mathias Küsel <mathiask@hotmail.de>
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,17 @@
-2015.03.23, Version 0.10.38 (Maintenance)
+2015.06.18, Version 0.10.39 (Maintenance)
+
+* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
+
+* install: fix source path for openssl headers (Oguz Bastemur)
+
+* install: make sure opensslconf.h is overwritten (Oguz Bastemur)
+
+* timers: fix timeout when added in timer's callback (Julien Gilli)
+
+* windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
+
+
+2015.03.23, Version 0.10.38 (Maintenance), 0b5731a63cc40c4fe9275c79158fe0a5dd4d1609
 
 * openssl: upgrade to 1.0.1m (Addressing multiple CVEs)
 
diff --git a/src/node_version.h b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 39
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""

-Original file line number
+Diff line change
 Florin-Cristian Gavrila <[email protected]>
 Tyler Anton <[email protected]>
 Jonas Dohse <[email protected]>
 +Paulo McNally <[email protected]>
 +AlexKVal <[email protected]>
 +João Reis <[email protected]>
 +Mathias Küsel <[email protected]>