commit c2452da6adb7ef6bd401e59ae50cbdfd3fffe562 Merge: 2c9a371666 3c73622f27 Author: David Goulet dgoulet@torproject.org Date: Thu Feb 3 08:30:40 2022 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-)