Merge branch 'token_bucket_refactor_squashed'

diff --cc doc/tor.1.txt
Simple merge

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

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

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

diff --cc src/test/include.am
index a663fa5524e64092105034bb85ea8b63d9e26a59,2da50de01d099baab2fe6b5dad469b27da3ab778..474da3f8805c4fbbde2a24e488364eef3f532613
--- 1/src/test/include.am
--- 2/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 f90669b5dde61ab62fec04cf7386600a43110d5f,7df385bc36f161f5829959c9d87c874b9bda77f2..422e181b9407ddd375a508663a382ca700b4ac04
--- 1/src/test/test.c
--- 2/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 34c6e46427e36df991a93962ddd96c58e4730a4d,95715da7a9a365c4d407aba3f1cf9ee692f2d7aa..1728831ed070bd39ec46efef7bb72e38643b84d7
--- 1/src/test/test.h
--- 2/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[];

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