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

10 years ago · cd6dff9728
3 changed files with 12 additions and 2 deletions
--- a/1
+++ b/1
@ -525,3 +525,4 @@ pkcs <pkcs@gmx.com>
 Saúl Ibarra Corretgé <saghul@gmail.com>
 silverwind <silv3rwind@gmail.com>
 Steven R. Loomis <srl@icu-project.org>
+James M Snell <jasnell@gmail.com>
--- a/11
+++ b/11
@ -1,4 +1,13 @@
-2014.12.17, Version 0.10.34 (Stable)
+2014.12.22, Version 0.10.35 (Stable)
+
+* tls: re-add 1024-bit SSL certs removed by f9456a2 (Chris Dickinson)
+
+* timers: don't close interval timers when unrefd (Julien Gilli)
+
+* timers: don't mutate unref list while iterating it (Julien Gilli)
+
+
+2014.12.17, Version 0.10.34 (Stable), 52795f8fcc2de77cf997e671ea58614e5e425dfe

 * uv: update to v0.10.30

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

-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1

 #ifndef NODE_TAG
 # define NODE_TAG ""