From: David Goulet <dgoulet@torproject.org>
Date: Thu, 29 Aug 2019 12:56:04 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1257'
X-Git-Tag: tor-0.4.2.1-alpha~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=960d9894159ebd830e41db7ed9ae4e166235e331;p=thirdparty%2Ftor.git

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

960d9894159ebd830e41db7ed9ae4e166235e331