commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 parent 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 17 Sep 2019 18:57:49 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.