From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Jul 2019 13:01:20 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7082cc16841f29183187dfa369749942cf8f1564;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" to avoid version bump.
---

7082cc16841f29183187dfa369749942cf8f1564