From: teor <teor@torproject.org>
Date: Wed, 13 Mar 2019 20:41:14 +0000 (+1000)
Subject: Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
X-Git-Tag: tor-0.4.1.1-alpha~45^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5606cfae472a4e49d07bb14f4dfa336a8ded3930;p=thirdparty%2Ftor.git

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

5606cfae472a4e49d07bb14f4dfa336a8ded3930
diff --cc src/or/rephist.h
index 3e64a3de40,37a91fd9b6..9ef49d19c0
--- 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);