Merge branch 'maint-0.4.5'
commitf98dbdb0693afa7dcbf1f395fa7e97116b59199e
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Mar 2021 20:28:14 +0000 (10 15:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Mar 2021 20:28:14 +0000 (10 15:28 -0500)
tree5e33e7667d077e088420cbbfc4097e47cfe52cdf
parent19e8844622c91c76a06b5f11e4f9e7290671a3c9
parente8d224dfb14a73e6b47ab09def56217f66a2ea46
Merge branch 'maint-0.4.5'
src/feature/hs/hs_metrics.c
src/feature/hs/hs_service.c