commit e58f11077e7c9f74708c65f1f59b8912e9a8e0b8 Merge: 56df12393 2d55620a9 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 5 08:31:20 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump