commit 670f5632a54e5ae119e9d92eaebc583aab3fe0d1 parent 537be1da33b50f5e232f422b23c3d75139dc2530 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 12 Aug 2020 08:40:10 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" merge to avoid MR 122 -- we already merged MR 123.