commit 7a343ecec55b47f5ff6dcf5ee61ad6d3e1796475 parent 0d5aaef465f782d46f538b03fd962ba7007fca11 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 10 Sep 2018 09:42:22 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump.