commit faf568fa7e8cfbebc236b6aef743251b7e6b9df4 parent 9969b0dfda4199147807305ff9bde061248f1f42 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 25 Oct 2017 09:28:15 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump
