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