summaryrefslogtreecommitdiff
path: root/src/or/main.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/main.c
parent06414b992201764e885962d5ed27bcae699745be (diff)
parentd72cfb259dfc83fe88c8589d4c1302a252823182 (diff)
downloadtor-c29a559e7ba36933cf9d6405017018c5817dde51.tar.gz
tor-c29a559e7ba36933cf9d6405017018c5817dde51.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 9709aebeb1..5fa3869ff8 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1556,7 +1556,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options)
generate_ed_link_cert(options, now, new_signing_key > 0)) {
log_err(LD_OR, "Unable to update Ed25519 keys! Exiting.");
tor_cleanup();
- exit(0);
+ exit(1);
}
}
return 30;
@@ -3168,7 +3168,7 @@ try_locking(const or_options_t *options, int err_if_locked)
r = try_locking(options, 0);
if (r<0) {
log_err(LD_GENERAL, "No, it's still there. Exiting.");
- exit(0);
+ exit(1);
}
return r;
}