commit 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50 parent de31c4757b6a58a3b5255298918c6d28e100b506 Author: teor <teor@torproject.org> Date: Wed, 12 Feb 2020 14:13:15 +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.
