From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Jun 2019 18:29:22 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70415c9f729847a56e7feefe75e77b2cb96d4667;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" merge to avoid taking pracktracker removal.
---

70415c9f729847a56e7feefe75e77b2cb96d4667