commit 2e2aacca2aa635a840c57e87e3769403505a19d2 parent c527a8a9c969d446ea0d7f6f4110d5082187dce2 Author: Nick Mathewson <nickm@torproject.org> Date: Sat, 3 Mar 2018 11:32:29 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.