aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitstats.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-18 10:06:06 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-18 10:06:06 -0400
commit935cd77f62f036e615923742de278398aa85f2bf (patch)
tree03ff72fd113b67752b3920c88bc7b6cc2bb00b8a /src/or/circuitstats.h
parent492f8a7c448dbdbea1966bdb9fd1775d3cda16fb (diff)
parent2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e (diff)
downloadtor-935cd77f62f036e615923742de278398aa85f2bf.tar.gz
tor-935cd77f62f036e615923742de278398aa85f2bf.zip
Merge branch 'bug22252_029' into maint-0.3.0
Diffstat (limited to 'src/or/circuitstats.h')
-rw-r--r--src/or/circuitstats.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h
index 23910276ae..c748f82d5e 100644
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@ -18,6 +18,9 @@ double get_circuit_build_close_time_ms(void);
double get_circuit_build_timeout_ms(void);
int circuit_build_times_disabled(const or_options_t *options);
+int circuit_build_times_disabled_(const or_options_t *options,
+ int ignore_consensus);
+
int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
void circuit_build_times_update_state(const circuit_build_times_t *cbt,
or_state_t *state);