diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-10 12:24:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-10 12:24:12 -0500 |
| commit | fc5a881bd3bd635be897fafdd4f9a30d5b2bed14 (patch) | |
| tree | 257131c7db975442223002903a4fde97f6c762d6 /src/or/router.c | |
| parent | e30fb0a160c083ceaf1bf215089ab5e1b0924f34 (diff) | |
| parent | 8bfa596c152603e376b8f096a3367c1d785d6763 (diff) | |
| download | tor-fc5a881bd3bd635be897fafdd4f9a30d5b2bed14.tar.gz tor-fc5a881bd3bd635be897fafdd4f9a30d5b2bed14.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 317cef2819..959e5e34c3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -956,14 +956,14 @@ init_keys(void) } if (ds->type != type) { log_warn(LD_DIR, "Configured authority type does not match authority " - "type in DirServer list. Adjusting. (%d v %d)", + "type in DirAuthority list. Adjusting. (%d v %d)", type, ds->type); ds->type = type; } if (v3_digest_set && (ds->type & V3_DIRINFO) && tor_memneq(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) { log_warn(LD_DIR, "V3 identity key does not match identity declared in " - "DirServer line. Adjusting."); + "DirAuthority line. Adjusting."); memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN); } |