commit c55c75bc9747b8c0d9763c4f5cb248b65836c615 Merge: 34f3d8d40 c1bf4260b Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:13:55 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2