Merge branch 'v0.10'
authorFedor Indutny <fedor@indutny.com>
Tue, 8 Apr 2014 04:55:57 +0000 (08:55 +0400)
committerFedor Indutny <fedor@indutny.com>
Tue, 8 Apr 2014 04:55:57 +0000 (08:55 +0400)
commitde7c0e8c021a4cce9be0e6e6a63d42455109ba94
tree1068c2c43b83c8d74c6f243c6bc6ce61c641a1b6
parenta0a180a0adba6be3c567cd89e4bbca3561893e0d
parentd6fd118727604bb94ca295f706e40119ad9de0a4
Merge branch 'v0.10'

Conflicts:
deps/openssl/asm/x64-elf-gas/aes/vpaes-x86_64.s
deps/openssl/asm/x64-macosx-gas/aes/vpaes-x86_64.s
deps/openssl/asm/x64-win32-masm/aes/vpaes-x86_64.asm
deps/openssl/openssl/CHANGES
deps/openssl/openssl/Makefile
deps/openssl/openssl/Makefile.org
deps/openssl/openssl/NEWS
deps/openssl/openssl/README
deps/openssl/openssl/crypto/opensslv.h
deps/openssl/openssl/openssl.spec
deps/openssl/openssl/ssl/s23_clnt.c
lib/http.js
test/simple/test-http-client-readable.js
doc/api/tls.markdown