commit 6fed66d268fa84bff7c68eb549907546b66ca6f8 Merge: a4e8f9450 12258bbb9 Author: David Goulet <dgoulet at torproject.org> Date: Tue Jul 3 13:31:08 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2