nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8'

Browse Source
This commit is contained in:
Nick Mathewson 2016-04-01 08:18:03 -04:00
commit 4b3e6c4d43
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug18133 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging):
- When we can't generate a signing key because OfflineMasterKey is set,
do not imply that we should have been able to load it.
Fixes bug 18133; bugfix on 0.2.7.2-alpha.

4
src/or/routerkeys.c
View File

@ -435,6 +435,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags,
"but it was encrypted. Try 'tor --keygen' instead, so you "
"can enter the passphrase.",
secret_fname);
} else if (offline_secret) {
tor_log(severity, LD_OR, "We wanted to load a secret key from %s, "
"but you're keeping it offline. (OfflineMasterKey is set.)",
secret_fname);
} else {
tor_log(severity, LD_OR, "We needed to load a secret key from %s, "
"but couldn't find it. %s", secret_fname,