Merge branch 'master' into master

lib/server.js

@@ -8,8 +8,10 @@ var rangeParser = require('range-parser')
 var url = require('url')
 
 function Server (torrent, opts) {
-  var server = http.createServer(opts)
+  var server = http.createServer()
   var natTraversal = require('./nat-traversal')
+  if (!opts) opts = {}
+  if (!opts.origin) opts.origin = '*' // allow all origins by default
 
   var sockets = []
   var pendingReady = []