commit 1fd6e25522ed064e8043f4548fbd33fca9246295 parent 7e2b012b46a4ade2818e47be15d76255cf6f121e Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 30 Nov 2017 12:22:38 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.