commit 5e7d505850607a16f6051a19ff60c39ff4c8393e parent b5a6c03998d42147135385f21bd7b85a02385e0f Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 27 Mar 2018 18:24:37 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid earlier version of 25629 fix.