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

Conflicts:
	src/node_version.h

.gitignore

@@ -28,6 +28,7 @@ Release/
 *.suo
 *.vcproj
 *.vcxproj
+!custom_actions.vcxproj
 *.vcxproj.user
 *.vcxproj.filters
 UpgradeLog*.XML

AUTHORS

@@ -17,6 +17,7 @@ Aku Kotkavuo
 Alejandro Oviedo
 Alex Kocharin
 Alex Xu
+AlexKVal
 Alexander Uvarov
 Alexandr Emelin
 Alexandre Marangone
@@ -155,6 +156,7 @@ Debjeet Biswas
 Denys Zariaiev
 Devin Torres
 Devon Govett
+Dmitri Melikyan
 Dmitriy Shalashov
 Dmitry Baranovskiy
 Dmitry Nizovtsev
@@ -324,6 +326,7 @@ Joshaven Potter
 Joshua Holbrook
 Joshua Peek
 Joshua S. Weinstein
+João Reis
 Ju-yeong Park
 Juanjo
 Julian Gruber
@@ -340,6 +343,7 @@ Kai Sasaki Lewuathe
 Kang-Hao Kenny
 Karl Guertin
 Karl Skomski
+Kat Marchán
 Kazuyuki Yamada
 Keith M Wesolowski
 Kelly Gerber
@@ -389,6 +393,7 @@ Mark Stosberg
 Marshall Culpepper
 Mathias Buus
 Mathias Bynens
+Mathias Küsel
 Mathias Pettersson
 Mathias Schreck
 Matt Brubeck
@@ -474,6 +479,7 @@ Paul Querna
 Paul Serby
 Paul Vorbach
 Paulo Matias
+Paulo McNally
 Pavel Lang
 Pedro Ballesteros
 Pedro Teixeira

ChangeLog

@@ -1,4 +1,23 @@
-2015.05.22, Version 0.12.4 (Stable)
+2015.06.22, Version 0.12.5 (Stable)
+
+* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
+
+* npm: upgrade to 2.11.2
+
+* uv: upgrade to 1.6.1
+
+* V8: avoid deadlock when profiling is active (Dmitri Melikyan)
+
+* 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.05.22, Version 0.12.4 (Stable), 0a604e92e258c5ee2752d763e50721e35053f135
 
 * npm: upgrade to 2.10.1
 
@@ -1032,7 +1051,20 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
 
 
-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)
 

deps/npm/.mailmap

@@ -3,12 +3,16 @@ Andrew Bradley <[email protected]>
 Andrew Lunny <[email protected]>
 Arlo Breault <[email protected]>
 Benjamin Coe <[email protected]>
+Benjamin Coe <[email protected]> <[email protected]>
 Brian White <[email protected]> <[email protected]>
+Cedric Nelson <[email protected]>
 Charlie Robbins <[email protected]>
 Dalmais Maxence <[email protected]>
+Danila Gerasimov <[email protected]>
 David Beitey <[email protected]>
 Domenic Denicola <[email protected]>
 Einar Otto Stangvik <[email protected]>
+Erik Wienhold <[email protected]>
 Evan Lucas <[email protected]> <[email protected]>
 Evan Lucas <[email protected]> <[email protected]>
 Faiq Raza <[email protected]>
@@ -25,18 +29,25 @@ Jonas Weber <[email protected]>
 Julien Meddah <[email protected]>
 Kris Windham <[email protected]>
 Lin Clark <[email protected]>
+Luke Arduini <[email protected]> <[email protected]>
 Maciej Małecki <[email protected]> <[email protected]>
 Max Goodman <[email protected]>
 Maxim Bogushevich <[email protected]>
 Maximilian Antoni <[email protected]> <[email protected]>
+Michael Hayes <[email protected]> <[email protected]>
 Nicolas Morel <[email protected]>
 Olivier Melcher <[email protected]>
 Ra'Shaun Stovall <[email protected]>
 Rebecca Turner <[email protected]> <[email protected]>
+Rebecca Turner <[email protected]> <[email protected]>
 Ryan Emery <[email protected]>
 Sam Mikes <[email protected]>
 Takaya Kobayashi <[email protected]>
+Timo Weiß <[email protected]>
 Tony <[email protected]>
+Trent Mick <[email protected]> <[email protected]>
 Visnu Pitiyanuvath <[email protected]>
 Will Elwood <[email protected]>
+Wout Mertens <[email protected]>
+Yeonghoon Park <[email protected]>
 Zeke Sikelianos <[email protected]>

deps/npm/AUTHORS

@@ -57,7 +57,7 @@ George Ornbo <[email protected]>
 Tim Oxley <[email protected]>
 Tyler Green <[email protected]>
 Dave Pacheco <[email protected]>
-atomizer <[email protected]>
+Danila Gerasimov <[email protected]>
 Rod Vagg <[email protected]>
 Christian Howe <[email protected]>
 Andrew Lunny <[email protected]>
@@ -73,7 +73,6 @@ Phillip Howell <[email protected]>
 Domenic Denicola <[email protected]>
 James Halliday <[email protected]>
 Jeremy Cantrell <[email protected]>
-Trent Mick <[email protected]>
 Ribettes <[email protected]>
 Don Park <[email protected]>
 Einar Otto Stangvik <[email protected]>
@@ -121,7 +120,6 @@ François Frisch <[email protected]>
 Trevor Burnham <[email protected]>
 Alan Shaw <[email protected]>
 TJ Holowaychuk <[email protected]>
-Luke Arduini <[email protected]>
 Nicholas Kinsey <[email protected]>
 Paulo Cesar <[email protected]>
 Elan Shanker <[email protected]>
@@ -157,7 +155,6 @@ Yeonghoon Park <[email protected]>
 Rafael de Oleza <[email protected]>
 Mikola Lysenko <[email protected]>
 Yazhong Liu <[email protected]>
-Younghoon Park <[email protected]>
 Neil Gentleman <[email protected]>
 Kris Kowal <[email protected]>
 Alex Gorbatchev <[email protected]>
@@ -206,13 +203,13 @@ Hunter Loftis <[email protected]>
 Peter Richardson <[email protected]>
 Jussi Kalliokoski <[email protected]>
 Filip Weiss <[email protected]>
-timoweiss <[email protected]>
+Timo Weiß <[email protected]>
 Christopher Hiller <[email protected]>
 Jérémy Lal <[email protected]>
 Anders Janmyr <[email protected]>
 Chris Meyers <[email protected]>
 Ludwig Magnusson <[email protected]>
-wmertens <[email protected]>
+Wout Mertens <[email protected]>
 Nick Santos <[email protected]>
 Terin Stock <[email protected]>
 Faiq Raza <[email protected]>
@@ -270,7 +267,7 @@ Julien Meddah <[email protected]>
 Michiel Sikma <[email protected]>
 Jakob Krigovsky <[email protected]>
 Charmander <[email protected]>
-erik wienhold <[email protected]>
+Erik Wienhold <[email protected]>
 James Butler <[email protected]>
 Kevin Kragenbrink <[email protected]>
 Arnaud Rinquin <[email protected]>
@@ -279,3 +276,15 @@ Antti Mattila <[email protected]>
 laiso <[email protected]>
 Matt Zorn <[email protected]>
 Kyle Mitchell <[email protected]>
+Jeremiah Senkpiel <[email protected]>
+Michael Klein <[email protected]>
+Simen Bekkhus <[email protected]>
+Victor <[email protected]>
+thefourtheye <[email protected]>
+Clay Carpenter <[email protected]>
+bangbang93 <[email protected]>
+Nick Malaguti <[email protected]>
+Cedric Nelson <[email protected]>
+Kat Marchán <[email protected]>
+Andrew <[email protected]>
+Eduardo Pinho <[email protected]>