From: David Goulet <dgoulet@torproject.org>
Date: Thu, 30 Jan 2020 18:53:32 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/1692'
X-Git-Tag: tor-0.4.3.2-alpha~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f07d8a1a92b75d37cc0bd9eb42d45850b8f60e54;p=thirdparty%2Ftor.git

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

f07d8a1a92b75d37cc0bd9eb42d45850b8f60e54