commit bc8636e89af7a49dfdbb4fd25500ef33fceb04d0 Merge: 4c094436c 6fed66d26 Author: David Goulet <dgoulet at torproject.org> Date: Tue Jul 3 13:31:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3