commit 3ac8cdb8cf93b3a80c18b66da34d77edd36ec377 Merge: 732855c2e 4746e1261 Author: David Goulet <dgoulet at torproject.org> Date: Tue Feb 26 10:53:09 2019 -0500 Merge branch 'maint-0.4.0'