commit 9b02641812c05ef2fb0d3148aaee023d89fb9af8 Merge: 7f3dc8327 dc5c9af6c Author: Nick Mathewson <nickm at torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1