commit fc591870b32cf818832f06eceecf355b38bcfa24 Merge: 31d0f9aea 056ffdec4 Author: David Goulet <dgoulet at torproject.org> Date: Mon Nov 26 14:59:23 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5