commit 5529449bb26aa4c20fdd7f9d09424840c2138596 Merge: 35a2590f2 955a62239 Author: teor <teor at torproject.org> Date: Fri Mar 1 14:17:41 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0