Support passing in "buffer" objects again where bytestrings are expected.

This fixes bzr's use of paramiko.

Fixes issue #343/#285.
We support 3.2
Join the threads with a low timeout.

Instead of using private methods on the threading class, let the
thread join, but with a low timeout.
Support py3.4.
This isn't worth having and then always forgetting about
More tweaks - don't make it sound like we routinely support >3, we don't
Merge branch 'master' into 371-int
Add a plus to our 3.3 support to denote 3.4 and on
Changelog re #371
Merge branch 'master' into 352-int
Changelog re #285, re #352
Support passing in "buffer" objects again where bytestrings are expected.

This fixes bzr's use of paramiko.

Fixes issue #343/#285.
Changelog re #285, re #352

Conflicts:
	sites/www/changelog.rst
Merge branch '1.13' into 1.14

Conflicts:
	sites/www/changelog.rst
Merge branch '1.14'

Conflicts:
	sites/www/changelog.rst
Minor refactor, re #169
Changelog re #169
Fix docstrings re: addition of `getfo`/`putfo`, closes #229
Merge branch '1.13' into 1.14
Merge branch '1.14'