commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy <ahf at torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3