commit 830b7b31b5d7a39f3838d87c0432035d0d9e4245 parent 71248800f72e8ca438f4c61d2c3715258a1b986a Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 2 Aug 2017 12:28:43 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.