aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-06-17 09:19:11 -0400
committerNick Mathewson <nickm@torproject.org>2015-06-17 09:19:11 -0400
commit43a98c7da6183e6e2e20784faed9f1c8aea5086e (patch)
treefe1a0ecdc8e30d6d93b1941aa953a239f37f205f /src/or/main.c
parent8092ae0c4ecc05d2bc058531be976e374febd9cb (diff)
parentc8cb55659acca96530a1d7f54bb96cac84626e17 (diff)
downloadtor-43a98c7da6183e6e2e20784faed9f1c8aea5086e.tar.gz
tor-43a98c7da6183e6e2e20784faed9f1c8aea5086e.zip
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 5fa3a01500..17177b0df5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2515,7 +2515,7 @@ tor_init(int argc, char *argv[])
/* Set up the crypto nice and early */
if (crypto_early_init() < 0) {
log_err(LD_GENERAL, "Unable to initialize the crypto subsystem!");
- return 1;
+ return -1;
}
/* Initialize the history structures. */