commit 937c1a3830b117514898adb083b25936da22eb0d Merge: b059c38d8 6c836b9e8 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 25 14:08:03 2018 -0400 Merge branch 'maint-0.3.4' "ours" merge to avoid version bump.