commit 1949c78237a0dc889c1ab5f9ff02fa18afb8cb58 Merge: 35746a9ee a46288252 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:46:30 2017 -0400 Merge branch 'maint-0.3.2'