Change how ssl_wrap_socket handles certfiles and keyfiles to match the regular python ssl library
Merge pull request #489 from tyewang/master

ssl_wrap_socket: Default keyfile to certfile, if not provided.
Add failing HTTPS handshake timeout test

The test hangs on failure, ugh. Would love to look into this at some point.
fix the behaviour
no newlines
Catch socket timeout as well
cool it with the new lines
Rephrased comment.
Merge pull request #493 from kevinburke/raise-timeout

Raise timeout error instead of SSLError on handshake timeout.
CHANGES for #492
Merge branch 'master' of github.com:kevinburke/urllib3