commit b74ed31f90ec43a7666cf622a6547d6d670e1692 parent 75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 9 Jul 2018 09:21:46 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid cherry-picked copy of #25512 fix, which is already in this branch.
