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

[teor at torproject.org]

commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867
Merge: 21c3488af 7660a7cf7
Author: teor <teor at torproject.org>
Date:   Wed Oct 23 08:24:30 2019 +1000

    Merge branch 'maint-0.2.9' into maint-0.3.5
    
    `git merge --strategy ours` to take the 0.3.5 changes for 31001,
    and ignore the conflicting 0.2.9 changes.