commit e8b26bb71b3465bd770f6ecff5be1d4e9a26d460 Merge: 3444371dd 24b68b477 Author: teor <teor at torproject.org> Date: Fri Apr 19 12:00:55 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0