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

[dgoulet at torproject.org]

commit 7bbec935c547a1e7a5039735949363c510d6fbd3
Merge: 34ac582f47 ad00da663e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 21 13:26:01 2020 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40226        |   5 +++
 src/feature/relay/router.c | 106 +++++++++++++++++++++++++++------------------
 src/feature/relay/router.h |   2 +
 src/test/test_stats.c      |  81 ++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 43 deletions(-)