#17493: re-enable a test on Windows.  Patch by Zachary Ware.
#17493: merge with 3.2.
#17493: merge with 3.3.
Issue #16997: unittest.TestCase now provides a subTest() context manager to procedurally generate, in an easy way, small test instances.
- Merge 3.3 (.hgtouch)
Issue #16475: Simplify the interface to r_ref_allocate and improve comments.
- .hgtouch: Add dependencies for GRAMMAR_H and GRAMMAR_C
Issue #16475 : Correctly handle the EOF when reading marshal streams.
#5713: Handle 421 error codes during sendmail by closing the socket.

This is a partial fix to the issue of servers disconnecting unexpectedly; in
this case the 421 says they are disconnecting, so we close the socket and
return the 421 in the appropriate error context.

Original patch by Mark Sapiro, updated by Kushal Das, with additional
tests by me.
Merge: #5713: Handle 421 error codes during sendmail by closing the socket.

This is a partial fix to the issue of servers disconnecting unexpectedly; in
this case the 421 says they are disconnecting, so we close the socket and
return the 421 in the appropriate error context.

Original patch by Mark Sapiro, updated by Kushal Das, with additional
tests by me.
Merge: #5713: Handle 421 error codes during sendmail by closing the socket.

This is a partial fix to the issue of servers disconnecting unexpectedly; in
this case the 421 says they are disconnecting, so we close the socket and
return the 421 in the appropriate error context.

Original patch by Mark Sapiro, updated by Kushal Das, with additional
tests by me.
remove the long obsolete mention of universal newlines mode only being
available when configured at compile time.
merge
merge
Refactor the Windows specific and POSIX specific implementations of
listdir into two separate coherent functions rather than interleaved
#ifdef's.
#5713: fix timing issue in smtplib tests.
Merge: #5713: fix timing issue in smtplib tests.
Merge: #5713: fix timing issue in smtplib tests.
#5712: Preemptively fix some other possible timing issues.
Merge: #5712: Preemptively fix some other possible timing issues.