patch 7.4.1370

Problem:    The Python test script may keep on running.
Solution:   Join the threads. (Yasuhiro Matsumoto)

src/testdir/test_channel.py

@@ -192,3 +192,8 @@ def writePortInFile(port):
 
     # Main thread terminates, but the server continues running
     # until server.shutdown() is called.
+    try:
+        while server_thread.isAlive(): 
+            server_thread.join(1)
+    except (KeyboardInterrupt, SystemExit):
+        server.shutdown()

src/version.c

@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1370,
 /**/
     1369,
 /**/