From: David Goulet <dgoulet@torproject.org>
Date: Tue, 18 Feb 2020 13:46:52 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/1740'
X-Git-Tag: tor-0.4.5.0-alpha-dev~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f24959df1dded4a6ca7244dede90bd00af8aa4e0;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1740'
---

f24959df1dded4a6ca7244dede90bd00af8aa4e0