commit 151d5ededf9fb334a5195904945f95cf626f51bc parent 46091a88ca6c3dd80c5a36e515d979930c1cdec1 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 25 Oct 2017 09:28:29 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump