diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-07-16 15:48:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-07-16 15:48:41 -0400 |
| commit | 3d19eb71d2621ae749e5bfd6134b0d2c2250f58f (patch) | |
| tree | 3dfa8a37f46ec4f4bffd4a3194a2a5db8bd85cc1 | |
| parent | 6a08bcf530f5991ae0e2600ef01be377857b5942 (diff) | |
| parent | 8596ccce017c4ccb26d78235e383fa4289220338 (diff) | |
| download | tor-3d19eb71d2621ae749e5bfd6134b0d2c2250f58f.tar.gz tor-3d19eb71d2621ae749e5bfd6134b0d2c2250f58f.zip | |
Merge remote-tracking branch 'public/feature_16580'
| -rw-r--r-- | src/or/main.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index af77f28dfd..fe93cdc12d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2034,7 +2034,7 @@ do_main_loop(void) /* Initialize the keypinning log. */ if (authdir_mode_v3(get_options())) { - char *fname = get_datadir_fname("key-pinning-entries"); + char *fname = get_datadir_fname("key-pinning-journal"); int r = 0; if (keypin_load_journal(fname)<0) { log_err(LD_DIR, "Error loading key-pinning journal: %s",strerror(errno)); @@ -2048,6 +2048,17 @@ do_main_loop(void) if (r) return r; } + { + /* This is the old name for key-pinning-journal. These got corrupted + * in a couple of cases by #16530, so we started over. See #16580 for + * the rationale and for other options we didn't take. We can remove + * this code once all the authorities that ran 0.2.7.1-alpha-dev are + * upgraded. + */ + char *fname = get_datadir_fname("key-pinning-entries"); + unlink(fname); + tor_free(fname); + } if (trusted_dirs_reload_certs()) { log_warn(LD_DIR, |