Merge back from r23b1-branch
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d43b33e..93fb4a2 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -470,6 +470,8 @@
         socketDataProcessed.acquire()
         socketDataProcessed.wait()
         socketDataProcessed.release()
+        for thread in threads:
+            thread.join()
         banner("logrecv output", "begin")
         sys.stdout.write(sockOut.getvalue())
         sockOut.close()