Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9

diff --cc src/or/rephist.c
Simple merge

diff --cc src/or/rephist.h
index 6d35ac67f6d244c3bcf7572f708c17ed1ea70b95,837bb8d0438ecd3b79b59950f6fe3e4122261da5..c464b34f7cfc331cd2d4a1bb3b93e99651ceec64
--- 1/src/or/rephist.h
--- 2/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);