Merge #10694: zipfile now ignores garbage at the end of a zipfile.

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

diff --cc Misc/NEWS
index f422b2ddf53b339db2eeb13618bde334524040d8,2d00324e2ea68e185e0af8e01c7bee19b2f5083d..dd7dedebf72a714a4dfbbba9473b982f16e33722
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -187,11 -22,10 +187,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10694: zipfile now ignores garbage at the end of a zipfile.
+ 
  - Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA.
  
 +- Issue #10424: Argparse now includes the names of the missing required
 +  arguments in the missing arguments error message.
 +
  - Issue #12168: SysLogHandler now allows NUL termination to be controlled using
    a new 'append_nul' attribute on the handler.