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

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

21d0d81d825fc2a63125afd9707e9f698fd39d07