diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:15:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:15:53 -0400 |
| commit | 36909674b45d05854b821b6ac5952126a2cd2ab3 (patch) | |
| tree | 76ea7ebde26ef0a1296d65681c533c5f4ef8d40a /src/or/directory.c | |
| parent | 5e5d4c99c131279931b702aa2a02639e9bdc0062 (diff) | |
| parent | cdb528d841e753b6cc0b8d8b2aeb6bed183a1a8d (diff) | |
| download | tor-36909674b45d05854b821b6ac5952126a2cd2ab3.tar.gz tor-36909674b45d05854b821b6ac5952126a2cd2ab3.zip | |
Merge remote-tracking branch 'teor/bug18963-remember-v2'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index a3ade8f164..c9c07f336d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2019,7 +2019,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } log_info(LD_DIR,"Received consensus directory (size %d) from server " "'%s:%d'", (int)body_len, conn->base_.address, conn->base_.port); - if ((r=networkstatus_set_current_consensus(body, flavname, 0))<0) { + if ((r=networkstatus_set_current_consensus(body, flavname, 0, + conn->identity_digest))<0) { log_fn(r<-1?LOG_WARN:LOG_INFO, LD_DIR, "Unable to load %s consensus directory downloaded from " "server '%s:%d'. I'll try again soon.", @@ -2062,7 +2063,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } if (src_code != -1) { - if (trusted_dirs_load_certs_from_string(body, src_code, 1)<0) { + if (trusted_dirs_load_certs_from_string(body, src_code, 1, + conn->identity_digest)<0) { log_warn(LD_DIR, "Unable to parse fetched certificates"); /* if we fetched more than one and only some failed, the successful * ones got flushed to disk so it's safe to call this on them */ |