commit a0ada65a3a1bedd4447a44dd88a48fde6d8c2d79 Merge: bcd6f21d9 aef6e6134 Author: teor <teor at torproject.org> Date: Thu Feb 28 10:49:55 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0