From: David Goulet <dgoulet@torproject.org>
Date: Wed, 2 Oct 2019 14:37:49 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1344'
X-Git-Tag: tor-0.4.2.2-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=014abf86e5a6484d23f72bb6959d78e379d90206;p=thirdparty%2Ftor.git

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

014abf86e5a6484d23f72bb6959d78e379d90206