From: David Goulet <dgoulet@torproject.org>
Date: Fri, 3 May 2019 17:11:03 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/954'
X-Git-Tag: tor-0.4.1.1-alpha~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2aa441b88e089c9aa650f25dd1b109bf14bc451d;p=thirdparty%2Ftor.git

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

2aa441b88e089c9aa650f25dd1b109bf14bc451d