diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-03-23 21:36:37 -0700 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-03-23 21:36:37 -0700 |
| commit | a0ce9cc38f5ffb0afe1093f86bff8d29a4e4d345 (patch) | |
| tree | 2ca4de8b015ef6be37413acbb39e97f7fc04e692 | |
| parent | e80bcf579732f46eee81a69f201e2e2458ea0237 (diff) | |
| parent | 7edfd5f6d11f7a219408bc1edf265dbfe2b90900 (diff) | |
| download | node-new-a0ce9cc38f5ffb0afe1093f86bff8d29a4e4d345.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10' into v0.12
Conflicts:
ChangeLog
src/node_version.h
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -953,7 +953,12 @@ * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich) -2015.03.11, Version 0.10.37 (Maintenance) +2015.03.23, Version 0.10.38 (Maintenance) + +* openssl: upgrade to 1.0.1m (Addressing multiple CVEs) + + +2015.03.11, Version 0.10.37 (Maintenance), 7d6b5b1d5ba726331f9ccaaae59af7cd53eee82e * uv: update to 0.10.36 (CVE-2015-0278) |