From: teor Date: Wed, 13 Mar 2019 20:37:50 +0000 (+1000) Subject: Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9 X-Git-Tag: tor-0.4.1.1-alpha~45^2~9^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bd9b2a6a0c7ab01ef72dd26e04544b00f8c9fa8;p=thirdparty%2Ftor.git Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9 --- 8bd9b2a6a0c7ab01ef72dd26e04544b00f8c9fa8 diff --cc src/or/rephist.h index 6d35ac67f6,837bb8d043..c464b34f7c --- 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);