From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 13 Apr 2018 14:47:24 +0000 (-0400)
Subject: Merge branch 'token_bucket_refactor_squashed'
X-Git-Tag: tor-0.3.4.1-alpha~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b152d62cee7480ee7b9b68dd9b619db65b6cd112;p=thirdparty%2Ftor.git

Merge branch 'token_bucket_refactor_squashed'
---

b152d62cee7480ee7b9b68dd9b619db65b6cd112
diff --cc src/test/include.am
index a663fa5524,2da50de01d..474da3f880
--- 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 f90669b5dd,7df385bc36..422e181b94
--- 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 34c6e46427,95715da7a9..1728831ed0
--- 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[];