commit 8bd9b2a6a0c7ab01ef72dd26e04544b00f8c9fa8 Merge: 90301247f 72e30f26e Author: teor <teor@torproject.org> Date: Thu Mar 14 06:37:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9 changes/bug23512 | 6 +++ src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 ++++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/or.h | 12 ++++++ src/or/relay.c | 1 + src/or/rephist.c | 26 +++++++----- src/or/rephist.h | 10 +++-- src/test/test_relay.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++--- 9 files changed, 210 insertions(+), 21 deletions(-) diff --cc src/or/rephist.h index 6d35ac67f,837bb8d04..c464b34f7 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -26,10 -26,10 +26,10 @@@ void rep_hist_note_bytes_written(uint64 void rep_hist_make_router_pessimal(const char *id, time_t when); - void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); - void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when); -int rep_hist_bandwidth_assess(void); +MOCK_DECL(int, rep_hist_bandwidth_assess, (void)); char *rep_hist_get_bandwidth_lines(void); void rep_hist_update_state(or_state_t *state); int rep_hist_load_state(or_state_t *state, char **err);