Merge pull request #300 from sipa/connecttimeout
authorJeff Garzik <jgarzik@exmulti.com>
Sat, 11 Jun 2011 23:17:13 +0000 (16:17 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Sat, 11 Jun 2011 23:17:13 +0000 (16:17 -0700)
non-blocking connect (by phantomcircuit)


Trivial merge