commit d043096d596b7c83de354776a2ee1a799c8b6a5d Merge: d5de1a0a5 6efc2a0e1 Author: David Goulet <dgoulet at torproject.org> Date: Wed Feb 13 11:02:09 2019 -0500 Merge branch 'maint-0.3.5'