diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-06 10:12:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-06 10:12:42 -0400 |
| commit | 440228907da9aff06562c4193ab9551b9fc5bad8 (patch) | |
| tree | aa3e98a74a4d0a70e24024c3dc0a1cb83961078a /src | |
| parent | 55a2bfb05609a790d47119d54a99d05380360131 (diff) | |
| parent | 74d710e7dc93c5449e4c88ffa0048afdb3c31e8f (diff) | |
| download | tor-440228907da9aff06562c4193ab9551b9fc5bad8.tar.gz tor-440228907da9aff06562c4193ab9551b9fc5bad8.zip | |
Merge remote-tracking branch 'sebastian/bug20065'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index b664a88760..8fa5799896 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -452,7 +452,8 @@ init_key_from_file(const char *fname, int generate, int severity, goto error; } } else { - log_info(LD_GENERAL, "No key found in \"%s\"", fname); + tor_log(severity, LD_GENERAL, "No key found in \"%s\"", fname); + goto error; } return prkey; case FN_FILE: @@ -560,7 +561,7 @@ load_authority_keyset(int legacy, crypto_pk_t **key_out, fname = get_datadir_fname2("keys", legacy ? "legacy_signing_key" : "authority_signing_key"); - signing_key = init_key_from_file(fname, 0, LOG_INFO, 0); + signing_key = init_key_from_file(fname, 0, LOG_ERR, 0); if (!signing_key) { log_warn(LD_DIR, "No version 3 directory key found in %s", fname); goto done; |