aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-19 13:36:59 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-19 13:36:59 -0400
commit428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7 (patch)
tree094116842853ec1472a18570a3310017fe6fabc9 /src/or/main.c
parent2f5202c6362408df5aad8f57f8dfffbafcbe0833 (diff)
parent8589c4704908c6089285226db7ae361634f8b843 (diff)
downloadtor-428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7.tar.gz
tor-428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7.zip
Merge branch 'ed25519_keygen_squashed'
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 08fd29427b..0b0207b975 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2057,7 +2057,7 @@ do_main_loop(void)
* TLS context. */
if (! client_identity_key_is_set()) {
if (init_keys() < 0) {
- log_err(LD_BUG,"Error initializing keys; exiting");
+ log_err(LD_OR, "Error initializing keys; exiting");
return -1;
}
}
@@ -2916,7 +2916,7 @@ do_list_fingerprint(void)
}
tor_assert(nickname);
if (init_keys() < 0) {
- log_err(LD_BUG,"Error initializing keys; can't display fingerprint");
+ log_err(LD_GENERAL,"Error initializing keys; exiting.");
return -1;
}
if (!(k = get_server_identity_key())) {