commit c5e610af05dc7112a9b3aa18feeb6ba63290ff5c parent 49cffee6355ce9ab4b95ca60cc237d2a538f6d27 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 30 Jan 2020 11:19:23 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 Using "ours" strategy to avoid version bump