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

[nickm at torproject.org]

commit ae2254e490ebfed746bed7e5ec359737cbb14085
Merge: ec696a95e5 014345ed6a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 09:55:55 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

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