[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

[ahf at torproject.org]

commit bd1c14f0156c4d166ed1706544242e31d7ddceff
Merge: 1e08efdb58 0135fb028c
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Oct 21 12:35:36 2021 +0000

    Merge branch 'maint-0.4.5' into maint-0.4.6

 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(-)