Fixes issue #17192: Update the ctypes module's libffi to v3.0.13.  This
specifically addresses a stack misalignment issue on x86 and issues on
some more recent platforms.
#17443: Fix buffering in IMAP4_stream.

In Python2 Popen uses *FILE objects, which wind up buffering even though
subprocess defaults to no buffering.  In Python3, subprocess streams really
are unbuffered by default, but the imaplib code assumes read is buffered.  This
patch uses the default buffer size from the io module to get buffered streams
from Popen.

Much debugging work and patch by Diane Trout.

The imap protocol is too complicated to write a test for this simple
change with our current level of test infrastructure.
#8862: Fix curses cleanup with getchar is interrupted by a signal.

I have no idea how one would write a test for this.

Patch by July Tikhonov.
#17471 - Improve urllib2 test coverage. Patch contributed by Daniel Wozniak
merge heads in 3.2
#1525919: Document MIMEText+set_payload encoding behavior.
Issue #10296 : Don't handle BreakPoint exceptions using
Structured Exception Handling on windows.
merge heads
Merge
#17471 - Increasing the urllib.error test coverage. Bringing it to 100%. Based on patch contributed by Daniel Wozniak
Fix usage of argument/parameter and markup.