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

Conflicts:
	src/node_crypto.cc
	test/simple/test-crypto.js

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

diff --cc lib/net.js
Simple merge

diff --cc test/simple/test-crypto.js
index d862fc3,96a269f..d5ae099
--- 1/test/simple/test-crypto.js
--- 2/test/simple/test-crypto.js
+++ b/test/simple/test-crypto.js
@@@ -1022,5 -938,15 +1022,18 @@@ assert.throws(function() 
    crypto.createVerify('RSA-SHA1').update('0', 'hex');
  }, /Bad input string/);
  
 -}, /SignFinal/);
+ assert.throws(function() {
+   var private = [
+     '-----BEGIN RSA PRIVATE KEY-----',
+     'MIGrAgEAAiEA+3z+1QNF2/unumadiwEr+C5vfhezsb3hp4jAnCNRpPcCAwEAAQIgQNriSQK4',
+     'EFwczDhMZp2dvbcz7OUUyt36z3S4usFPHSECEQD/41K7SujrstBfoCPzwC1xAhEA+5kt4BJy',
+     'eKN7LggbF3Dk5wIQN6SL+fQ5H/+7NgARsVBp0QIRANxYRukavs4QvuyNhMx+vrkCEQCbf6j/',
+     'Ig6/HueCK/0Jkmp+',
+     '-----END RSA PRIVATE KEY-----',
+     ''
+   ].join('\n');
+   crypto.createSign('RSA-SHA256').update('test').sign(private);
++}, /RSA_sign:digest too big for rsa key/);
++
 +// Make sure memory isn't released before being returned
 +console.log(crypto.randomBytes(16));