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

diff --cc src/or/circuitlist.c
index 7bdef0b878dca1e6383a27459631114e568ea996,da19a534e48ba7424fb03091ed5769f1137207b9..78d8a66023a6e5bd00f4558e9bb53f9a56bbf781
--- 1/src/or/circuitlist.c
--- 2/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/circuitlist.h
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 507272159203125d2d781d4dc08f473ba1cdc1ea,e67209d3ee104482607d314e780ddd3028118754..37a91fd9b62de7fbcca94031701cdc916f40b01b
--- 1/src/or/rephist.h
--- 2/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);
  

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

diff --cc src/test/test_relay.c
Simple merge