From: David Goulet <dgoulet@torproject.org>
Date: Mon, 19 Aug 2019 13:49:33 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1213'
X-Git-Tag: tor-0.4.2.1-alpha~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8e6eab379bdc67ebdec1c3022c11e1e9e90d503;p=thirdparty%2Ftor.git

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

a8e6eab379bdc67ebdec1c3022c11e1e9e90d503