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

Conflicts:
	lib/events.js
	src/udp_wrap.cc

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

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

diff --cc lib/events.js
index 77b7303,f43df09..770ba12
--- 1/lib/events.js
--- 2/lib/events.js
+++ b/lib/events.js
@@@ -32,31 -33,21 +32,31 @@@ function EventEmitter() 
      }
    }
    this._events = this._events || {};
 -  this._maxListeners = this._maxListeners || defaultMaxListeners;
 +  this._maxListeners = this._maxListeners || undefined;
  }
 -exports.EventEmitter = EventEmitter;
 +module.exports = EventEmitter;
 +
 +// Backwards-compat with node 0.10.x
 +EventEmitter.EventEmitter = EventEmitter;
 +
 +EventEmitter.usingDomains = false;
 +
 +EventEmitter.prototype.domain = undefined;
 +EventEmitter.prototype._events = undefined;
 +EventEmitter.prototype._maxListeners = undefined;
 +
 +// By default EventEmitters will print a warning if more than 10 listeners are
 +// added to it. This is a useful default which helps finding memory leaks.
 +EventEmitter.defaultMaxListeners = 10;
 +
  
 -// By default EventEmitters will print a warning if more than
 -// 10 listeners are added to it. This is a useful default which
 -// helps finding memory leaks.
 -//
  // Obviously not all Emitters should be limited to 10. This function allows
  // that to be increased. Set to zero for unlimited.
 -var defaultMaxListeners = 10;
  EventEmitter.prototype.setMaxListeners = function(n) {
-   if (!util.isNumber(n) || n < 0)
 -  if (typeof n !== 'number' || n < 0 || isNaN(n))
++  if (!util.isNumber(n) || n < 0 || isNaN(n))
      throw TypeError('n must be a positive number');
    this._maxListeners = n;
 +  return this;
  };
  
  EventEmitter.prototype.emit = function(type) {