From: David Goulet <dgoulet@torproject.org>
Date: Thu, 5 Mar 2020 15:52:59 +0000 (-0500)
Subject: Merge commit 'ef991b04e26eb4db'
X-Git-Tag: tor-0.4.5.0-alpha-dev~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1da0b05a5cace6ed05244e3e2c12e4babd4641fa;p=thirdparty%2Ftor.git

Merge commit 'ef991b04e26eb4db'
---

1da0b05a5cace6ed05244e3e2c12e4babd4641fa