2 files changed, 3 insertions, 0 deletions

diff --git a/subcmds/status.py b/subcmds/status.py
index 69e2dbfc..75d68ebc 100644
--- a/subcmds/status.py
+++ b/subcmds/status.py
@@ -122,6 +122,7 @@ the following meanings:
         t = _threading.Thread(target=self._StatusHelper,
                               args=(project, counter, sem, output))
         threads_and_output.append((t, output))
+        t.daemon = True
         t.start()
       for (t, output) in threads_and_output:
         t.join()
diff --git a/subcmds/sync.py b/subcmds/sync.py
index bfe146b6..595a35aa 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -261,6 +261,8 @@ later is required to fix a server side protocol bug.
                                       pm,
                                       sem,
                                       err_event))
+        # Ensure that Ctrl-C will not freeze the repo process.
+        t.daemon = True
         threads.add(t)
         t.start()