Nuke old merge mistake (or what looks like one anyway.)
Potentially horrible attempt at manual subprocess-read timeouts
Fix NameError in error-handling case

Fixes #268
Changelog re #268
Preliminary changelog entry re #252
I hate you sometimes, ReST
Slightly safer socket.error handling
Don't drop/lose data when our inner timeout goges off.
Don't raise timeouts as ProxyCommand failures, thanks @mgedmin
Braino in changelog text
Tweak changelog language
Merge branch '1.11' into 1.12
Merge branch '1.12'

Conflicts:
	sites/www/changelog.rst