(cherry picked from commit 61677384) Co-authored-by: Henry Wilkes <henry@torproject.org>
mentioned in merge request !1590 (merged)