diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-12-05 09:24:51 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-12-05 09:24:51 -0500 |
commit | 1f95e80351cdb45de0994a0a3aba277267d41ad0 (patch) | |
tree | 6e97361353b913618e71441400b34cb560a2679e /src/feature/nodelist/networkstatus.c | |
parent | d4f558e385fd9e3f757278653d22290c3816c39e (diff) | |
parent | a2f81b644b2a4679c634744d3830cdb6397f0814 (diff) | |
download | tor-1f95e80351cdb45de0994a0a3aba277267d41ad0.tar.gz tor-1f95e80351cdb45de0994a0a3aba277267d41ad0.zip |
Merge branch 'prop293_squashed'
Diffstat (limited to 'src/feature/nodelist/networkstatus.c')
-rw-r--r-- | src/feature/nodelist/networkstatus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 5e62903d48..ed01576242 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -724,8 +724,8 @@ networkstatus_vote_find_mutable_entry(networkstatus_t *ns, const char *digest) /** Return the entry in <b>ns</b> for the identity digest <b>digest</b>, or * NULL if none was found. */ -const routerstatus_t * -networkstatus_vote_find_entry(networkstatus_t *ns, const char *digest) +MOCK_IMPL(const routerstatus_t *, +networkstatus_vote_find_entry,(networkstatus_t *ns, const char *digest)) { return networkstatus_vote_find_mutable_entry(ns, digest); } |