commit 6e01d5e68506056b1c9ec6b19a60911b15512bd8 parent 5aaecf6d07a3be0f15ef17643d4bc9ef9d69e0c3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 9 Jul 2020 13:14:22 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 `-s ours` to avoid version bump.