commit 494ced690d4db09b5660472df490f9c8512c2684 parent 210a94b23159176524e2e94931a236c84981bf7d Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 9 Nov 2020 17:13:41 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "-s ours" to avoid version bump.