Issue #5784: Merge zlib from 3.5

diff --cc Doc/library/zlib.rst
Simple merge

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

diff --cc Modules/clinic/zlibmodule.c.h
index 222cb6779a1c0a70c0e5ac21c5d6b8979805ed36,602ae1df827fab11b00b029bea0b70dddf07e3ca..7ca48cb16b08cbddceca5cf4cc09c04379b2afa6
--- 1/Modules/clinic/zlibmodule.c.h
--- 2/Modules/clinic/zlibmodule.c.h
+++ b/Modules/clinic/zlibmodule.c.h
@@@ -440,4 -442,4 +443,4 @@@ exit
  #ifndef ZLIB_COMPRESS_COPY_METHODDEF
      #define ZLIB_COMPRESS_COPY_METHODDEF
  #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */
- /*[clinic end generated code: output=e6f3b79e051ecc35 input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=f31627b314a7bd2f input=a9049054013a1b77]*/
++/*[clinic end generated code: output=8669ba9266c78433 input=a9049054013a1b77]*/

diff --cc Modules/zlibmodule.c
Simple merge