commit b93af906c444a71b52105c49239069adf680efad Merge: 1ea523c705 e0a6a0d085 Author: Alexander Færøy ahf@torproject.org Date: Thu Oct 14 19:18:22 2021 +0000

Merge remote-tracking branch 'tor-gitlab/mr/456' into main

changes/ticket40484 | 5 +++++ src/feature/hs/hs_config.c | 1 + 2 files changed, 6 insertions(+)