commit 42e12a3537fef04ab77defd6cb5581add439de43 parent a57f1ff7abdd61137c579d806bcd2150fd5fecf6 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 18 Sep 2017 14:40:22 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" to avoid version bump.