From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Sep 2019 23:12:08 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.2-alpha~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93def2bb4f2b7facd1a5a4d158143f09434e4667;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" to avoid version bump.
---

93def2bb4f2b7facd1a5a4d158143f09434e4667