Fix annoying socket.timeout exception bug.
Fix annoying socket.timeout exception bug.

We were catching the exception, but it turns out that since sockipy
renames our socket class, sometimes the socket.timeout that we threw was
not the same as the one we caught...

isislovecruft/torflow,isislovecruft/torflow,isislovecruft/torflow,isislovecruft/torflow