summaryrefslogtreecommitdiff
path: root/src/or/circuitstats.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-18 10:06:27 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-18 10:06:27 -0400
commitb214c2c0955373bdf0eab6954c19dd9b559200cf (patch)
tree2f5cc8de4ca63b7f9c4087448ce4693cda15b84a /src/or/circuitstats.h
parente04da2828d6bbf1499d3df5ba85a8baf4c485bb7 (diff)
parent935cd77f62f036e615923742de278398aa85f2bf (diff)
downloadtor-b214c2c0955373bdf0eab6954c19dd9b559200cf.tar.gz
tor-b214c2c0955373bdf0eab6954c19dd9b559200cf.zip
Merge branch '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 4977b26c0d..8a1dec4bfd 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);