commit 8970d7f7ae7d3a48f93e24d66ef252ead732d216 Merge: 5d1db8fdfd e74f168bb4 Author: David Goulet dgoulet@torproject.org Date: Tue Dec 8 14:51:43 2020 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/ticket40205 | 5 +++++ src/feature/relay/selftest.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)