[tor-commits] [tor/master] Merge branch 'mr_224_squashed'

[nickm at torproject.org]

commit 2bfb76b927111824a2051d09b1f5542ee58e2a6f
Merge: 6e83a52077 ed3f46a385
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 9 10:03:45 2020 -0500

    Merge branch 'mr_224_squashed'

 changes/ticket30477        |  4 ++++
 src/feature/relay/router.c | 23 +++++++++++++++++++++++
 src/feature/relay/router.h |  1 +
 3 files changed, 28 insertions(+)