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

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

1bf377f4b68136a238d9e54d5b56169c9589b583