From: David Goulet <dgoulet@torproject.org>
Date: Wed, 26 Jun 2019 15:39:33 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1140'
X-Git-Tag: tor-0.4.2.1-alpha~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6afe1b00c9c73b1bfae4fede61791dff7e7be277;p=thirdparty%2Ftor.git

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

6afe1b00c9c73b1bfae4fede61791dff7e7be277