commit 005a20ec859aa1c9e2f6d6bf5a1e70069f7f20f5 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 21 11:57:23 2016 -0400

Log a better message when OfflineMasterKey is set.

Fixes bug 18133; bugfix on 0.2.7.2-alpha. --- changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

diff --git a/changes/bug18133 b/changes/bug18133 new file mode 100644 index 0000000..177d286 --- /dev/null +++ b/changes/bug18133 @@ -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. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index d88bfca..8006112 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -427,6 +427,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,