From: teor <teor@torproject.org>
Date: Wed, 12 Feb 2020 04:13:15 +0000 (+1000)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.3-alpha~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50;p=thirdparty%2Ftor.git

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.
---

0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50