commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b Merge: eef77227e b0bfee8c7 Author: Alexander Færøy <ahf at torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3