Merge remote-tracking branch 'origin/v0.10'

Conflicts:
	deps/v8/src/objects-inl.h
	deps/v8/src/objects.h
	src/node_crypto.cc

diff --cc doc/api/stdio.markdown
Simple merge

diff --cc lib/crypto.js
Simple merge

diff --cc src/node_crypto.cc
index bab3b69,c53d2ce..21541f3
--- 1/src/node_crypto.cc
--- 2/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@@ -3502,8 -3948,8 +3504,8 @@@ Handle<Value> RandomBytes(const Argumen
  }
  
  
- Handle<Value> GetCiphers(const Arguments& args) {
+ Handle<Value> GetSSLCiphers(const Arguments& args) {
 -  HandleScope scope;
 +  HandleScope scope(node_isolate);
  
    SSL_CTX* ctx = SSL_CTX_new(TLSv1_server_method());
    if (ctx == NULL) {
@@@ -3540,10 -3987,18 +3543,18 @@@ static void array_push_back(const TypeN
  }
  
  
+ Handle<Value> GetCiphers(const Arguments& args) {
+   HandleScope scope;
+   Local<Array> arr = Array::New();
+   EVP_CIPHER_do_all_sorted(array_push_back<EVP_CIPHER>, &arr);
+   return scope.Close(arr);
+ }
+ 
+ 
  Handle<Value> GetHashes(const Arguments& args) {
 -  HandleScope scope;
 +  HandleScope scope(node_isolate);
    Local<Array> arr = Array::New();
-   EVP_MD_do_all_sorted(add_hash_to_array, &arr);
+   EVP_MD_do_all_sorted(array_push_back<EVP_MD>, &arr);
    return scope.Close(arr);
  }