commit 70e49331b6cbd007a10ca5c662e10adb5680b196 Merge: 21261aff72 ea5eebf431 Author: David Goulet dgoulet@torproject.org Date: Wed Nov 3 09:52:48 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)