commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb Merge: c57896a76 483082b57 Author: Alexander Færøy <ahf at torproject.org> Date: Tue Jun 30 13:48:49 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3