commit 998a4ca5e866b1f78a2db0efd7ef2e086aa3596a Merge: f3161adcd 3fa66f979 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Mar 29 08:01:44 2018 -0400 Merge branch 'maint-0.3.3' "-s ours" to avoid version bump.