commit a255ca9b1228e70088cd6fd624dbcca86a9376ae parent 938487d4b427888fe554dc158888e52fca279783 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 13 Mar 2020 16:57:27 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" to avoid version bump.