[tor-commits] [tor/master] Merge remote-tracking branch 'github/lazy_bucket_refill'

[nickm at torproject.org]

commit 3527f4b8a4f002e7b910eacd4ead6e9044cb4003
Merge: 1b40e9986 bd3f8260a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 09:47:05 2018 -0400

    Merge remote-tracking branch 'github/lazy_bucket_refill'

 changes/bug25373          |   7 ++
 changes/bug25828          |   7 ++
 doc/tor.1.txt             |   8 +-
 src/common/token_bucket.c |  13 ++-
 src/common/token_bucket.h |   4 +-
 src/or/connection.c       | 251 ++++++++++++++++++++++++++++++++++------------
 src/or/connection.h       |   8 +-
 src/or/hibernate.c        |   2 +-
 src/or/main.c             | 120 ++++++----------------
 src/or/main.h             |   1 +
 src/or/or.h               |   1 +
 11 files changed, 252 insertions(+), 170 deletions(-)