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

[nickm at torproject.org]

commit ec696a95e58870862625a44f2c9152be2526414c
Merge: 1da8621c0a 0f2d45328d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:53:07 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

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