Merge #20206, #5803: more efficient algorithm that doesn't truncate output.

(No idea why test_tarfile is listed as changed...it isn't.)

diff --cc Lib/test/test_email/test_email.py
Simple merge

diff --cc Misc/NEWS
Simple merge