From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 13 Mar 2020 20:57:27 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.3-alpha~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a255ca9b1228e70088cd6fd624dbcca86a9376ae;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.
---

a255ca9b1228e70088cd6fd624dbcca86a9376ae