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/or.h | |
parent | b3534dfc5e85c82e915c1576a8a58500fdd7c878 (diff) | |
parent | e202f3a1ca2d2ef87820d0ff618a37d76b4e702a (diff) | |
download | tor-882e0fbd76b9b56b943680a310d16fc94ab07438.tar.gz tor-882e0fbd76b9b56b943680a310d16fc94ab07438.zip |
Merge branch 'bug17795'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index f438212b31..6fd6dfc5fb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1935,7 +1935,7 @@ typedef struct cached_dir_t { size_t dir_len; /**< Length of <b>dir</b> (not counting its NUL). */ size_t dir_z_len; /**< Length of <b>dir_z</b>. */ time_t published; /**< When was this object published. */ - digests_t digests; /**< Digests of this object (networkstatus only) */ + common_digests_t digests; /**< Digests of this object (networkstatus only) */ int refcnt; /**< Reference count for this cached_dir_t. */ } cached_dir_t; @@ -2573,7 +2573,7 @@ typedef struct networkstatus_t { struct authority_cert_t *cert; /**< Vote only: the voter's certificate. */ /** Digests of this document, as signed. */ - digests_t digests; + common_digests_t digests; /** List of router statuses, sorted by identity digest. For a vote, * the elements are vote_routerstatus_t; for a consensus, the elements |