#17690: test_time now works with unittest test discovery.  Patch by Zachary Ware.
#17690: merge with 3.3.
Fix a crash when setting a servername callback on a SSL server socket and the client doesn't send a server name.
Patch by Kazuhiro Yoshida.
(originally issue #8109)
Fix supernumerary 's' in sys._debugmallocstats() output.
Fix supernumerary 's' in sys._debugmallocstats() output.
python-gdb.py: Replace invalid Unicode character with U+FFFD to be able to
display invalid strings. Such strings can be found while Python is creating a
new string, in a text decoder for example, when Python is compiled in debug
mode.
Close #17693: Rewrite CJK decoders to use the _PyUnicodeWriter API instead of
the legacy Py_UNICODE API.

Add also a new _PyUnicodeWriter_WriteChar() function.
Issue #13056: Reenable test_multibytecodec.Test_StreamWriter tests
#17699: Fix the new getpass test failures on windows.

Patch by Zachary Ware.
#17585: Fixed IDLE regression. Now closes when using exit() or quit().
#17585: merge with 3.3.
#17692: test_sqlite now works with unittest test discovery.  Patch by Zachary Ware.
#17692: merge with 3.3.
#6696: add documentation for the Profile objects, and improve profile/cProfile docs.  Patch by Tom Pinckney.
#6696: merge with 3.3.
#17688: fix declaration for richcmp example in the docs.

Thanks to Daniel Mullner
#17688: fix declaration for richcmp example in the docs.

Thanks to Daniel Mullner
Merge heads.
Merge heads.
Null merge.