commit 4746e1261b403302852e3107a986e663d2b063c1 Merge: 9c4ec414b 1216f9953 Author: David Goulet <dgoulet at torproject.org> Date: Tue Feb 26 10:48:12 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0