commit 805a785780c2f3abccf080caddc345ca8f484797 parent d4a758e08373854639af6991ec95836fa7c15ca4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 1 Mar 2018 16:42:25 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.