[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

[teor at torproject.org]

commit 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50
Merge: de31c4757 ff5220536
Author: teor <teor at torproject.org>
Date:   Wed Feb 12 14:13:15 2020 +1000

    Merge branch 'maint-0.4.2' into maint-0.4.3
    
    "ours" merge, because simiar BridgeDistribution fixes have already
    been merged to maint-0.4.3. (See 32753.)
    
    The stem changes in 33075 have already been merged to maint-0.4.3,
    so this "ours" merge does not affect them.