[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[nickm at torproject.org]

commit f98dbdb0693afa7dcbf1f395fa7e97116b59199e
Merge: 19e8844622 e8d224dfb1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 10 15:28:14 2021 -0500

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