commit 6be7023e1c5c755e8de9d6d8ec94d19cf7d4f55f Merge: 608f109597 a08b12568e Author: David Goulet dgoulet@torproject.org Date: Thu Feb 3 08:30:40 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40552 | 3 +++ src/feature/hs/hs_metrics.c | 6 +++++- src/test/test_metrics.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-)