commit dc3890439f156d4c79b153f13f7ecf3393362b29 parent 8f858de8193cc66c9b19627ad5c07261639bd7df Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 1 Dec 2017 09:34:47 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump.