commit 4d504bf098069538984690de7966a907180c7efe parent 48e990359b05661f2dd0ae503143ee9b18442475 Author: teor <teor@torproject.org> Date: Fri, 19 Apr 2019 11:39:17 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 "ours" merge, to avoid taking any changes from PR 772 in 0.3.4. (We already merged a different fix for 23790 into 0.3.2 and later.)
