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

[dgoulet at torproject.org]

commit a08b12568eb7f1d1fb8bd34847461e0887b6981d
Merge: bc500804fd 3c73622f27
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Feb 3 08:30:40 2022 -0500

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