commit 2a24ce9656cc36283b615b0da9e64c16adf36374 Merge: 9e81221c9 67043d957 Author: Nick Mathewson <nickm at torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2