summaryrefslogtreecommitdiff
path: root/src/or/networkstatus.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-12 09:20:56 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-12 09:20:56 -0500
commit1ad96ed9cda1573cfd9f0a388ac28bfeaf3b62aa (patch)
treeca9fe6491eb2c8c7494c0c5481437059632e0e90 /src/or/networkstatus.h
parent9025991a8d16b28e0b1ed875aab76630f9aa1715 (diff)
parentd46c1b49a459f1249ef358b3751ef656d9e19038 (diff)
downloadtor-1ad96ed9cda1573cfd9f0a388ac28bfeaf3b62aa.tar.gz
tor-1ad96ed9cda1573cfd9f0a388ac28bfeaf3b62aa.zip
Merge remote-tracking branch 'rubiate/ticket20511'
Diffstat (limited to 'src/or/networkstatus.h')
-rw-r--r--src/or/networkstatus.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h
index 454356e0bb..d584c2ecfc 100644
--- a/src/or/networkstatus.h
+++ b/src/or/networkstatus.h
@@ -81,6 +81,8 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void));
MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor,
(consensus_flavor_t f));
MOCK_DECL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now));
+int networkstatus_consensus_reasonably_live(networkstatus_t *consensus,
+ time_t now);
networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now,
int flavor);
MOCK_DECL(int, networkstatus_consensus_is_bootstrapping,(time_t now));