#17304: merge with 3.3.

diff --cc Misc/NEWS
index 60dda936abcfa9077c3634f63b95c51aee3a868a,70e71a21b6050bacad87a45be2cd88b7fd164ecb..ce46afcb5d9d26c83982740fd2d8da86f38288e3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -891,8 -644,9 +891,11 @@@ Test
  
  - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #17304: test_hash now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17303: test_future* now work with unittest test discovery.
    Patch by Zachary Ware.