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

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

ff93133403fa927eedc424dfb00557fcaab6aede