[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5

[nickm at torproject.org]

commit 758000aa98432414847393420324fef983c66f1e
Merge: 01c4abc2d4 685c4866ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 8 14:30:11 2021 -0500

    Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5

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