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

10 years ago · 6b264dd1f9
2 changed files with 11 additions and 2 deletions
--- a/11
+++ b/11
@ -1,4 +1,13 @@
-2014.12.22, Version 0.10.35 (Stable)
+2015.01.26, Version 0.10.36 (Stable)
+
+* openssl: update to 1.0.1l
+
+* v8: Fix debugger and strict mode regression (Julien Gilli)
+
+* v8: don't busy loop in cpu profiler thread (Ben Noordhuis)
+
+
+2014.12.22, Version 0.10.35 (Stable), a363f61ca839e817eb6853c5dc5af8c3b9b9226b

 * tls: re-add 1024-bit SSL certs removed by f9456a2 (Chris Dickinson)

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

-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1

 #ifndef NODE_TAG
 # define NODE_TAG ""