commit 751c71827364f1c5d7291cc379c8ba977df1bf37 Merge: bf91b6e05 f69797b67 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1