commit dde6b8906f9b26f594e24a4ebe75d38893a4fd76 Merge: 4806aa5da8 3f1544bbd9 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 12 08:13:26 2020 -0500 Merge branch 'maint-0.4.4' into master "ours" to avoid version bump.