commit 7e3f7ab4060531c28ebf3f544f4ec5196e0424ec Merge: cd264e145 6945f2b3e Author: Nick Mathewson <nickm at torproject.org> Date: Wed May 15 07:41:42 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0