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