Pass the SOCKSError to the handshakeDone errback instead of raising it.

Patch by Karsten Loesing.
Change copyright to The Tor Project.
Change email address for Linus.

Also, add a "thanks Karsten".
Refine language in two comments.
Merge branch 'handlesockserror'