commit bf91b6e05fcc8195bb79272065aa2dbd2a2d7eeb Merge: 9b65d7f41 84c4a2bc3 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1