diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-01 08:17:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-01 08:17:56 -0400 |
| commit | fdb57db581d4510b621fba087d9a7979934ea871 (patch) | |
| tree | 659c7cf0ea3cae559d86c044b0e03aa5a32d7a3f | |
| parent | e247093e0efba100ec6f3abdfa9d3433d51389f0 (diff) | |
| parent | 4093f343caa576a28269ecdff0c3025f081b058a (diff) | |
| download | tor-fdb57db581d4510b621fba087d9a7979934ea871.tar.gz tor-fdb57db581d4510b621fba087d9a7979934ea871.zip | |
Merge branch 'bug18133_027' into maint-0.2.8
| -rw-r--r-- | changes/bug18133 | 4 | ||||
| -rw-r--r-- | src/or/routerkeys.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug18133 b/changes/bug18133 new file mode 100644 index 0000000000..177d286495 --- /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 efb3cbb571..fba3491f2b 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -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, |