commit 495db72c1eee7f9ed890ae252eb5b61a70438065 parent 73869c99a07a298238b14426866bc64acc73da38 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 1 Dec 2017 09:35:07 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.