commit 725f2371042b36c151a42e575a5b319d3820126c parent 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 24 Oct 2017 09:10:17 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump
