commit a255ca9b1228e70088cd6fd624dbcca86a9376ae Merge: 938487d4b 2f4fa423c Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 13 16:57:27 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
"ours" to avoid version bump.
tor-commits@lists.torproject.org