commit 50a686e586c0208e7aa9c3ea4e0210ab73cc0b71 parent ea47563dd7da134e8adfa8bff0515ee925318013 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 7 Jan 2019 21:16:56 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 "Ours" to avoid version bump.