commit ad00da663ea008cf47a7a70df21f855bfddad142 Merge: d45354d5ea f4cbcde2da Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 21 13:25:52 2020 -0500

Merge branch 'mr_240_squashed' into maint-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(-)