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