commit 78285594f51fc0009d3911fb894e12b793536a5d parent 283ce30c536568129f0a2b531d4c195c93c7ff52 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 9 Jul 2020 10:30:03 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 `-s ours` to avoid version bump.