diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-01 08:18:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-01 08:18:03 -0400 |
| commit | 4b3e6c4d43b169c04b7fa34c1f2bb618b97151bf (patch) | |
| tree | 0b561eb1b9f444f5a4092747586e8228daf2a3d8 | |
| parent | 9e57ffa520bb0e8b9a7dd32e005e6b29a3f8bdfa (diff) | |
| parent | fdb57db581d4510b621fba087d9a7979934ea871 (diff) | |
| download | tor-4b3e6c4d43b169c04b7fa34c1f2bb618b97151bf.tar.gz tor-4b3e6c4d43b169c04b7fa34c1f2bb618b97151bf.zip | |
Merge branch '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, |