summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-26 14:15:21 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-26 14:15:21 -0400
commitc29a559e7ba36933cf9d6405017018c5817dde51 (patch)
treee74c9f9bfb81b2e8847b19e02dd4452cee7c29fd /src/or/control.c
parent06414b992201764e885962d5ed27bcae699745be (diff)
parentd72cfb259dfc83fe88c8589d4c1302a252823182 (diff)
downloadtor-c29a559e7ba36933cf9d6405017018c5817dde51.tar.gz
tor-c29a559e7ba36933cf9d6405017018c5817dde51.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index b9717250bb..232f7b9c2c 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -6526,7 +6526,7 @@ monitor_owning_controller_process(const char *process_spec)
msg);
owning_controller_process_spec = NULL;
tor_cleanup();
- exit(0);
+ exit(1);
}
}