commit 39ade001a70178adcd63c12a7246a23ab4d07534 Merge: ba7d6a1e1 b2d528d3b Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.3.1'