commit ec695755e730ad73b60542c21971353fedce16b1 Merge: 732855c2e 1216f9953 Author: David Goulet <dgoulet at torproject.org> Date: Tue Feb 26 10:48:14 2019 -0500 Merge branch 'maint-0.3.5'