From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 Oct 2019 21:20:54 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=215a6debba8c047bea25ec29d6a3339286a36b4e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'

"Ours" merge to avoid takign ".enable_practracker_in_hooks"
---

215a6debba8c047bea25ec29d6a3339286a36b4e