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