#16919: merge with 3.3.

diff --cc Misc/NEWS
index 5d49d0f56c84cb285c8b32b9c02d4eb9ab62773f,7360af4436c11635cc32d614df249f142a36ccaa..bf6ab72c86c9ced5f2445556eba99d98c17dcfc6
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -618,8 -421,9 +618,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16919: test_crypt now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16910: test_bytes, test_unicode, and test_userstring now work with
    unittest test discovery.  Patch by Zachary Ware.