commit 71248800f72e8ca438f4c61d2c3715258a1b986a parent 9c294d29eaa2e171a6c503d6c3ca4cac2fae7c57 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 1 Aug 2017 14:38:57 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.