commit a89ebdbc37003f1b0f611618e083a91b2fd36276 Merge: d06bcf7672 cda7acb35d Author: Alexander Færøy ahf@torproject.org Date: Wed Dec 15 12:43:48 2021 +0000

Merge branch 'maint-0.4.6' into release-0.4.6

changes/ticket40527 | 5 +++ src/feature/stats/rephist.c | 12 ------- src/test/test_stats.c | 82 ++------------------------------------------- 3 files changed, 8 insertions(+), 91 deletions(-)