commit a2b0d7ead432907944d78648ab95a7e2682c69db Merge: f6ebe8b920 3260d323a6 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 10 08:53:07 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

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