commit 4872c28afa5295b81f05def0b763022ac093bd09 Merge: 9409d98ee 830b7b31b Author: Nick Mathewson <nickm at torproject.org> Date: Wed Aug 2 12:29:42 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1