#16898: merge with 3.3.

diff --cc Misc/NEWS
index 09d7b4b5639ab6002fa386f0482f1b6af6b3d301,f1e39aeb7e1dd7c825f2bdba6d6592f7283b36b2..4938a4927694c0070928031d0fee35d0f3f52004
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -612,8 -408,9 +612,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16898: test_bufio now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16888: test_array now works with unittest test discovery.
    Patch by Zachary Ware.