[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit 35cba3ae330c46c62910d566d7d17be48a4a6f6c
Merge: 8c4581865e e8d224dfb1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 10 15:28:14 2021 -0500

    Merge branch 'maint-0.4.5' into release-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(-)