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

[nickm at torproject.org]

commit 7be37a26ac769e3059223553970b09b7b41688f7
Merge: 3260d323a6 ae2254e490
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 09:55:55 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 src/core/or/relay.c | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)