From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Dec 2019 18:32:06 +0000 (-0500)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.5~3^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8df0f5f32a1deaeb329ad78f05d209173c5f458;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.
---

f8df0f5f32a1deaeb329ad78f05d209173c5f458