commit 6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e parent 4edbbee2fd5133ce1657a6a48cc4997e73233e34 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 25 Oct 2017 09:28:41 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump