commit 0ea508ec6f540f0c768d993df257a9733fac4074 parent 3c691613c6bf3aae88c6aa7d9297d928dc051388 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 2 Nov 2018 13:01:53 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid version bump.