commit 42c0358ceb2b030e9b9f751ad02ddd82b5912038 parent 7ba849349a29bfb07e23180483cd490f93e7a1f7 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 9 Jul 2020 13:14:58 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 `-s ours` to avoid version bump.