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

commit 3260d323a663da3a1a2b65085dce1b469be101bb Merge: 69bd4a8a2d ec696a95e5 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40389 | 3 +++ src/core/or/relay.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)