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

[nickm at torproject.org]

commit 5481412cd7e1ffadc20a31ddf93dc1222210e7df
Merge: a2b0d7ead4 7be37a26ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 09:55:55 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

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