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

[nickm at torproject.org]

commit 34c2574aa97a05381c1796fb12d82616f96fdeb6
Merge: f2c81a8ea 1b31195b4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 13 16:31:58 2018 -0400

    Merge branch 'token_bucket_once_again_squashed'

 src/common/token_bucket.c | 206 ++++++++++++++++++++++++++++------------------
 src/common/token_bucket.h |  86 +++++++++++++------
 src/or/connection.c       |  70 ++++++++--------
 src/or/connection_or.c    |   4 +-
 src/or/main.c             |  16 ++--
 src/or/main.h             |   4 +-
 src/or/or.h               |   2 +-
 src/test/test_bwmgt.c     | 164 ++++++++++++++++++------------------
 8 files changed, 322 insertions(+), 230 deletions(-)