commit e71db3a4be1cab933f721d63d4ed98f50dddd7c0 Merge: 48ee68656a f944e46399 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 1 09:56:35 2021 -0400

Merge remote-tracking branch 'tor-gitlab/mr/405'

changes/issue40338 | 3 +++ src/feature/hs/hs_config.c | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-)