commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy <ahf at torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3