commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc parent f406b9df0533c9730b4537b39f3a7f8d232f3558 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 19 Jan 2018 10:17:33 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.