From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 24 Jun 2019 13:32:54 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b6bd768d374340e667b42fad07a51094abb38a7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" to avoid version bump.
---

3b6bd768d374340e667b42fad07a51094abb38a7