--- a/mercurial/commandserver.py	Wed Dec 20 02:13:35 2017 -0800
+++ b/mercurial/commandserver.py	Wed Dec 20 11:35:38 2017 -0800
@@ -449,6 +449,8 @@
     def init(self):
         self._sock = socket.socket(socket.AF_UNIX)
         self._servicehandler.bindsocket(self._sock, self.address)
+        if util.safehasattr(util, 'unblocksignal'):
+            util.unblocksignal(signal.SIGCHLD)
         o = signal.signal(signal.SIGCHLD, self._sigchldhandler)
         self._oldsigchldhandler = o
         self._socketunlinked = False