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

[teor at torproject.org]

commit cbce8dedd3703424111928d68dfe8920900ce054
Merge: 116970dda 2460b4461
Author: teor <teor at torproject.org>
Date:   Fri Apr 19 11:59:18 2019 +1000

    Merge branch 'maint-0.2.9' into maint-0.3.4
    
    "ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
    (We already merged PR 791 for 29665 into 0.3.4.)