commit 1432cc8429b55ea561c551941ed54e5871050fa0 Merge: 91f72bbb6 d4ca18573 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Dec 6 14:38:06 2017 -0500 Merge branch 'maint-0.3.2'