From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 Nov 2019 13:06:36 +0000 (-0500)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.
---

00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c