commit 8ef4c78bd612edfc9ecbf7c8e92a2c337f32e932 Merge: b4a3e31fe 6d0883e9e Author: teor <teor at torproject.org> Date: Thu Aug 8 11:11:38 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1