commit 9ca25f3a68374ca4787b4eaa8bf4fb3365061d26 Merge: 884056ae5 76fd872db Author: teor <teor at torproject.org> Date: Wed Nov 6 11:20:02 2019 +1000 Merge branch 'maint-0.4.2'