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

[nickm at torproject.org]

commit 8734eea31ba1634474d519240b7bc5141c4becbd
Merge: d9edf143ab 3260d323a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:53:07 2021 -0400

    Merge branch 'maint-0.4.6'

 changes/ticket40389 |  3 +++
 src/core/or/relay.c | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)