From: David Goulet <dgoulet@torproject.org>
Date: Wed, 19 Jun 2019 11:47:03 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1113'
X-Git-Tag: tor-0.4.2.1-alpha~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6579d801f2a7536123dccde2edcff4cc33683a3;p=thirdparty%2Ftor.git

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

e6579d801f2a7536123dccde2edcff4cc33683a3