commit 147c67d81dd52c4b09546b69992c0633f4007649 Merge: ccf2d6561 bbbb5f39b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 12 12:05:18 2018 -0400 Merge branch 'maint-0.3.3' "ours" to avoid version bump.