From: Mike Perry <mikeperry-git@torproject.org>
Date: Mon, 17 Sep 2018 23:31:34 +0000 (+0000)
Subject: Merge branch 'bug23512-v4-032' into bug23512-v4-033
X-Git-Tag: tor-0.3.5.2-alpha~18^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72cef6102845e556cf58636e47f8d411ba19f456;p=thirdparty%2Ftor.git

Merge branch 'bug23512-v4-032' into bug23512-v4-033
---

72cef6102845e556cf58636e47f8d411ba19f456
diff --cc src/or/circuitlist.c
index 7bdef0b878,da19a534e4..78d8a66023
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@@ -51,10 -51,9 +51,11 @@@
   * logic, which was originally circuit-focused.
   **/
  #define CIRCUITLIST_PRIVATE
 +#include "torint.h"  /* TOR_PRIuSZ */
 +
  #include "or.h"
  #include "channel.h"
+ #include "channeltls.h"
  #include "circpathbias.h"
  #include "circuitbuild.h"
  #include "circuitlist.h"
diff --cc src/or/rephist.h
index 5072721592,e67209d3ee..37a91fd9b6
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@@ -13,9 -13,16 +13,9 @@@
  #define TOR_REPHIST_H
  
  void rep_hist_init(void);
 -void rep_hist_note_connect_failed(const char* nickname, time_t when);
 -void rep_hist_note_connect_succeeded(const char* nickname, time_t when);
 -void rep_hist_note_disconnect(const char* nickname, time_t when);
 -void rep_hist_note_connection_died(const char* nickname, time_t when);
 -void rep_hist_note_extend_succeeded(const char *from_name,
 -                                    const char *to_name);
 -void rep_hist_note_extend_failed(const char *from_name, const char *to_name);
  void rep_hist_dump_stats(time_t now, int severity);
- void rep_hist_note_bytes_read(size_t num_bytes, time_t when);
- void rep_hist_note_bytes_written(size_t num_bytes, time_t when);
+ void rep_hist_note_bytes_read(uint64_t num_bytes, time_t when);
+ void rep_hist_note_bytes_written(uint64_t num_bytes, time_t when);
  
  void rep_hist_make_router_pessimal(const char *id, time_t when);