diff -r b5651ae53127 -r c07424ec633c mercurial/commandserver.py
--- a/mercurial/commandserver.py	Tue Jun 12 23:04:27 2018 +0200
+++ b/mercurial/commandserver.py	Tue Jun 12 12:41:09 2018 -0700
@@ -494,6 +494,8 @@
                     conn.close()  # release handle in parent process
             else:
                 try:
+                    selector.close()
+                    self._sock.close()
                     self._runworker(conn)
                     conn.close()
                     os._exit(0)