commit 4d60ab8fb798c35de2a646bfa7c71a88835b9c11 Merge: ec5611e876 4ab4521c31 Author: David Goulet dgoulet@torproject.org Date: Tue Jan 18 13:15:38 2022 -0500

Merge branch 'maint-0.4.5' into maint-0.4.6

src/feature/relay/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)