commit 6d3bb9a1a577bcfe173c604bd40dea34fd1d3a03 Merge: 98d84587a8 0a38e02fb3 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 27 19:15:25 2020 -0400 Merge branch 'maint-0.4.4' "ours" to avoid version bump.