Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'

Conflicts:
	src/or/or.h
	src/test/Makefile.nmake

diff --cc src/common/compat_libevent.c
Simple merge

diff --cc src/common/compat_libevent.h
Simple merge

diff --cc src/common/torlog.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/or/include.am
index 0f53f007f071d8e47f8de956d3340c65e8e8e7cc,b2b940614fbfc33dc14438f2cbb8fcff5ef69a7f..643f7ce001d938314618fb1e4b302a3d2a5e22c3
--- 1/src/or/include.am
--- 2/src/or/include.am
+++ b/src/or/include.am
@@@ -74,11 -80,12 +74,12 @@@ LIBTOR_A_SOURCES = 
        src/or/routerlist.c                             \
        src/or/routerparse.c                            \
        src/or/routerset.c                              \
+       src/or/scheduler.c                              \
        src/or/statefile.c                              \
        src/or/status.c                                 \
 +      src/or/onion_ntor.c                             \
        $(evdns_source)                                 \
        $(tor_platform_source)                          \
 -      $(onion_ntor_source)                            \
        src/or/config_codedigest.c
  
  src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)

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

diff --cc src/or/or.h
index bff7267d37ffa884bb3af0f89b7eee327ed5ff57,25df54a6694a064ab934307e5f0d1a433ac72eab..ccb29ee7dfda64e515f83c4fac7050fccfd49ddc
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -4230,6 -4227,21 +4248,18 @@@ typedef struct 
    /** How long (seconds) do we keep a guard before picking a new one? */
    int GuardLifetime;
  
 -  /** Should we send the timestamps that pre-023 hidden services want? */
 -  int Support022HiddenServices;
 -
+   /** Low-water mark for global scheduler - start sending when estimated
+    * queued size falls below this threshold.
+    */
+   uint32_t SchedulerLowWaterMark;
+   /** High-water mark for global scheduler - stop sending when estimated
+    * queued size exceeds this threshold.
+    */
+   uint32_t SchedulerHighWaterMark;
+   /** Flush size for global scheduler - flush this many cells at a time
+    * when sending.
+    */
+   unsigned int SchedulerMaxFlushCells;
  } or_options_t;
  
  /** Persistent state for an onion router, as saved to disk. */

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

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

diff --cc src/test/Makefile.nmake
index f6ee7f3f5356ff7ee40b67d7e9f2cf052892c5dd,e2cf53895f6167afab0f7fba286cb061ab9f7f0c..043561768322770db9b5e1a39e0538a647436c8a
--- 1/src/test/Makefile.nmake
--- 2/src/test/Makefile.nmake
+++ b/src/test/Makefile.nmake
@@@ -11,11 -11,11 +11,12 @@@ LIBS = ..\..\..\build-alpha\lib\libeven
   ws2_32.lib advapi32.lib shell32.lib \
   crypt32.lib gdi32.lib user32.lib
  
- TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \
+ TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_channeltls.obj \
 -      test_containers.obj test_controller_events.obj test_crypto.obj \
 -      test_data.obj test_dir.obj test_microdesc.obj test_pt.obj test_util.obj \
 -      test_config.obj test_cell_formats.obj test_relay.obj test_replay.obj \
++        test_containers.obj \
 +      test_controller_events.obj test_crypto.obj test_data.obj test_dir.obj \
 +      test_checkdir.obj test_microdesc.obj test_pt.obj test_util.obj test_config.obj \
-       test_cell_formats.obj test_replay.obj test_introduce.obj tinytest.obj \
-       test_hs.obj
++      test_cell_formats.obj test_relay.obj test_replay.obj \
+       test_scheduler.obj test_introduce.obj test_hs.obj tinytest.obj
  
  tinytest.obj: ..\ext\tinytest.c
        $(CC) $(CFLAGS) /D snprintf=_snprintf /c ..\ext\tinytest.c

diff --cc src/test/include.am
Simple merge

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

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