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

[dgoulet at torproject.org]

commit 3d03016eb01a58a663d0b7432360a805636c1865
Merge: f96acf79f4 758000aa98
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 8 14:31:13 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40279        |  4 ++++
 src/feature/relay/router.c | 33 +++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)