commit d006cb25bd86f1acfbd8ac5626723b53a16ef43a Merge: f8ff2f12d 00fe21472 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2