From: David Goulet <dgoulet@torproject.org>
Date: Mon, 26 Aug 2019 18:35:27 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1239'
X-Git-Tag: tor-0.4.2.1-alpha~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d819dfbdede4aafe78b61c02ad8d712fc9e4fc72;p=thirdparty%2Ftor.git

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

d819dfbdede4aafe78b61c02ad8d712fc9e4fc72