commit e8d224dfb14a73e6b47ab09def56217f66a2ea46 Merge: d382f26914 f93ccb8d24 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 10 15:27:50 2021 -0500

Merge remote-tracking branch 'tor-gitlab/mr/335' into maint-0.4.5

changes/ticket40334 | 3 +++ src/feature/hs/hs_metrics.c | 8 +++++--- src/feature/hs/hs_service.c | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-)