commit 971f4bf13944864156684b3d3be8df53fb9d0686 parent 52b508735f4e3a58e6d9c808f7815bba66f5190e Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 7 Jan 2019 21:17:46 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump
