[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/338'

[nickm at torproject.org]

commit d642da020e750f6cff65755dcd66fed6eed2b443
Merge: 982829650c 265cca935a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 14 13:10:18 2021 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/338'

 changes/ticket40337            | 16 ++++++++++++++++
 doc/man/tor.1.txt              |  5 +++++
 src/app/config/config.c        |  2 ++
 src/app/config/or_options_st.h |  4 ++++
 src/app/config/testnet.inc     |  1 +
 src/feature/relay/router.c     |  5 ++++-
 src/feature/stats/bwhist.c     | 19 ++++++++++++++-----
 src/feature/stats/bwhist.h     |  2 +-
 src/test/test_relay.c          |  4 ++--
 9 files changed, 49 insertions(+), 9 deletions(-)