[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4

[teor at torproject.org]

commit 5606cfae472a4e49d07bb14f4dfa336a8ded3930
Merge: 155b0f552 e91b999cf
Author: teor <teor at torproject.org>
Date:   Thu Mar 14 06:41:14 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4

 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        |  25 ++++++-----
 src/or/rephist.h        |  10 +++--
 src/or/scheduler_kist.c |   2 -
 src/test/test_relay.c   | 113 +++++++++++++++++++++++++++++++++++++++++++++---
 10 files changed, 210 insertions(+), 22 deletions(-)

diff --cc src/or/rephist.h
index 3e64a3de4,37a91fd9b..9ef49d19c
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@@ -19,10 -19,10 +19,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);