commit 38f3cf4103cc87d6de711e5495bdac01bbe47879 Merge: 2042ebe88 c9c4a3d0f Author: Alexander Færøy <ahf at torproject.org> Date: Tue Jun 30 14:03:04 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3