[tor-commits] [tor/master] Merge branch 'token_bucket_refactor_squashed'

[nickm at torproject.org]

commit b152d62cee7480ee7b9b68dd9b619db65b6cd112
Merge: ad57b1279 787bafc0f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 13 10:47:24 2018 -0400

    Merge branch 'token_bucket_refactor_squashed'

 changes/ticket25760               |   5 +
 changes/ticket25766               |   3 +
 doc/tor.1.txt                     |   6 -
 src/common/compat_time.c          |  13 ++
 src/common/compat_time.h          |   1 +
 src/common/include.am             |   2 +
 src/common/token_bucket.c         | 199 +++++++++++++++++++++
 src/common/token_bucket.h         |  75 ++++++++
 src/or/config.c                   |  15 +-
 src/or/connection.c               | 353 +++++++++-----------------------------
 src/or/connection.h               |  11 +-
 src/or/connection_or.c            |  14 +-
 src/or/control.c                  |  23 ---
 src/or/control.h                  |   5 +-
 src/or/main.c                     |  46 ++---
 src/or/main.h                     |   6 +-
 src/or/or.h                       |  20 +--
 src/test/include.am               |   1 +
 src/test/test.c                   |   1 +
 src/test/test.h                   |   1 +
 src/test/test_bwmgt.c             | 205 ++++++++++++++++++++++
 src/test/test_controller_events.c |  75 --------
 src/test/test_options.c           |  10 --
 src/test/test_util.c              |   7 +
 24 files changed, 635 insertions(+), 462 deletions(-)

diff --cc src/test/include.am
index a663fa552,2da50de01..474da3f88
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -88,8 -88,8 +88,9 @@@ src_test_test_SOURCES = 
  	src/test/test_addr.c \
  	src/test/test_address.c \
  	src/test/test_address_set.c \
 +	src/test/test_bridges.c \
  	src/test/test_buffers.c \
+ 	src/test/test_bwmgt.c \
  	src/test/test_cell_formats.c \
  	src/test/test_cell_queue.c \
  	src/test/test_channel.c \
diff --cc src/test/test.c
index f90669b5d,7df385bc3..422e181b9
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -811,8 -811,8 +811,9 @@@ struct testgroup_t testgroups[] = 
    { "addr/", addr_tests },
    { "address/", address_tests },
    { "address_set/", address_set_tests },
 +  { "bridges/", bridges_tests },
    { "buffer/", buffer_tests },
+   { "bwmgt/", bwmgt_tests },
    { "cellfmt/", cell_format_tests },
    { "cellqueue/", cell_queue_tests },
    { "channel/", channel_tests },
diff --cc src/test/test.h
index 34c6e4642,95715da7a..1728831ed
--- a/src/test/test.h
+++ b/src/test/test.h
@@@ -186,7 -178,7 +186,8 @@@ extern struct testcase_t accounting_tes
  extern struct testcase_t addr_tests[];
  extern struct testcase_t address_tests[];
  extern struct testcase_t address_set_tests[];
 +extern struct testcase_t bridges_tests[];
+ extern struct testcase_t bwmgt_tests[];
  extern struct testcase_t buffer_tests[];
  extern struct testcase_t cell_format_tests[];
  extern struct testcase_t cell_queue_tests[];