commit 3930ffdf63425c344e14c45cff6780108cfa038b parent d21e5cfc241204ccc6b8b0a484573edaea086772 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 16 Feb 2018 08:47:12 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid conflicts with the cherry-picked fix for 24898.
