commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Mar 18 12:16:59 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
"ours" to avoid version bump.