From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Dec 2019 21:03:01 +0000 (-0500)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.6~14^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17561434ebcf01eaa86737b2acfb65df8b57a8b5;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.
---

17561434ebcf01eaa86737b2acfb65df8b57a8b5