commit 578eead1c81572d5b7d9ab81a14963d9711bc0b6 Merge: bae96cf1d b68de63eb Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2