commit b2d528d3be456c12c5c922935d68acceb516824b Merge: 751c71827 4d2620352 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1