commit ef70f5f42a875c8d1d1280c6ef6f86d01983b6ef Merge: 96b69152ce 8e7778ec8a Author: Nick Mathewson <nickm at torproject.org> Date: Wed Oct 7 09:29:17 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4