[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[nickm at torproject.org]

commit 0667eaa9bfdd18fe602f964840d662c0b934247a
Merge: 8734eea31b 7be37a26ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 09:55:55 2021 -0400

    Merge branch 'maint-0.4.6'

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