commit d7ad6d924ed12f54e2b61d2013046389673cd8ae Merge: 5ce348c4c f5e3bcb60 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jul 9 15:17:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump.