#17249: merge with 3.3.

diff --cc Misc/NEWS
index c91c3dd4a1ed3fd5d16b243df5323c22fae0c3ee,a184bfcb301197b2f434d4f2bf35f0fc2aa07a67..07c86db10f7e80d8bbdd62defdac68a1f9e52291
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -857,10 -620,8 +857,12 @@@ Extension Module
  Tests
  -----
  
+ - Issue #17249: convert a test in test_capi to use unittest and reap threads.
+ 
 +- Issue #17107: Test client-side SNI support in urllib.request thanks to
 +  the new server-side SNI support in the ssl module.  Initial patch by
 +  Daniel Black.
 +
  - Issue #17041: Fix testing when Python is configured with the
    --without-doc-strings.