From: David Goulet <dgoulet@torproject.org>
Date: Mon, 20 Jan 2020 15:44:03 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/1668'
X-Git-Tag: tor-0.4.3.1-alpha~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca8b90a843b404799550fb88f8542040698d2a94;p=thirdparty%2Ftor.git

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

ca8b90a843b404799550fb88f8542040698d2a94