commit ea5eebf431c732b8f1c0e9daa9b7b716c48bc76f Merge: 1e3e921d7d 6e8e1a4e6f Author: David Goulet dgoulet@torproject.org Date: Wed Nov 3 09:52:03 2021 -0400
Merge branch 'tor-gitlab/mr/477' into maint-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(-)