Issue #25624: ZipFile now always writes a ZIP_STORED header for directory

entries.  Patch by Dingyuan Wang.

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

diff --cc Lib/zipfile.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 428a4d4770de77a6de3405416990b5119214f2c1,a13e1987a185530e870e55ddac52b91b62d487ae..6e573e61b71c6b0bb73223931681f50c78ded245
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -77,13 -106,9 +77,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
+   entries.  Patch by Dingyuan Wang.
+ 
 +- Issue #25626: Change three zlib functions to accept sizes that fit in
 +  Py_ssize_t, but internally cap those sizes to UINT_MAX.  This resolves a
 +  regression in 3.5 where GzipFile.read() failed to read chunks larger than 2
 +  or 4 GiB.  The change affects the zlib.Decompress.decompress() max_length
 +  parameter, the zlib.decompress() bufsize parameter, and the
 +  zlib.Decompress.flush() length parameter.
 +
  - Issue #25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True)
    when the OS gives priority to errors such as EACCES over EEXIST.