commit ee929eedbb4ca50fef3fbca9066908e8bc6e56fa parent 342ea3155196ed0b696ce368a4e226ba832586d0 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 30 Jan 2020 11:19:41 -0500 Merge branch 'maint-0.4.2' Using "ours" strategy to avoid version bump.