diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:25:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:25:12 -0500 |
| commit | 882e0fbd76b9b56b943680a310d16fc94ab07438 (patch) | |
| tree | d738366734ac1ae1f523fd1343064c4b93af36d6 /src/or/dirserv.c | |
| parent | b3534dfc5e85c82e915c1576a8a58500fdd7c878 (diff) | |
| parent | e202f3a1ca2d2ef87820d0ff618a37d76b4e702a (diff) | |
| download | tor-882e0fbd76b9b56b943680a310d16fc94ab07438.tar.gz tor-882e0fbd76b9b56b943680a310d16fc94ab07438.zip | |
Merge branch 'bug17795'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3771818457..ee85cebf7e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1230,7 +1230,7 @@ free_cached_dir_(void *_d) void dirserv_set_cached_consensus_networkstatus(const char *networkstatus, const char *flavor_name, - const digests_t *digests, + const common_digests_t *digests, time_t published) { cached_dir_t *new_networkstatus; @@ -1239,7 +1239,7 @@ dirserv_set_cached_consensus_networkstatus(const char *networkstatus, cached_consensuses = strmap_new(); new_networkstatus = new_cached_dir(tor_strdup(networkstatus), published); - memcpy(&new_networkstatus->digests, digests, sizeof(digests_t)); + memcpy(&new_networkstatus->digests, digests, sizeof(common_digests_t)); old_networkstatus = strmap_set(cached_consensuses, flavor_name, new_networkstatus); if (old_networkstatus) |