#16925: merge with 3.3.

diff --cc Misc/NEWS
index bb46fe1ba5b2d5e69a34d3b5cce099cbc4159993,1d12d263d039d7ef5619fe2ccdcf6b16d0de2a58..3742d3f191a6d9291f2c9a10f72506e069bbdc32
--- 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 #16925: test_configparser now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16918: test_codecs now works with unittest test discovery.
    Patch by Zachary Ware.