commit 36e6ad6c7b8c8205cda5763eff2ec535e788b1a0 Merge: 44671995d1 83f8fe05e8 Author: David Goulet dgoulet@torproject.org Date: Wed Nov 3 09:53:35 2021 -0400
Merge branch 'maint-0.4.6'
changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)