[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/388' into main

[ahf at torproject.org]

commit 1665d1194263ac595cf6ad24cb38d80c7ec446a5
Merge: b3d7a56f2a 96b59fc4d3
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue May 25 14:17:12 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/388' into main

 changes/bug40394            | 4 ++++
 src/feature/stats/rephist.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)