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

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

diff --cc src/or/or.h
Simple merge

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

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

diff --cc src/or/rephist.h
index 3e64a3de400b97dba84d6f993a27dd6095d14c32,37a91fd9b62de7fbcca94031701cdc916f40b01b..9ef49d19c070f4d3ac677b45abe8733fdb4861a6
--- 1/src/or/rephist.h
--- 2/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);

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