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

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

a1dec44723b4c2b38140b49efd0d30bb784626ae