[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor at torproject.org]

commit 4d504bf098069538984690de7966a907180c7efe
Merge: 48e990359 ec213ae8a
Author: teor <teor at torproject.org>
Date:   Fri Apr 19 11:39:17 2019 +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.)