From: David Goulet <dgoulet@torproject.org>
Date: Wed, 15 May 2019 19:35:22 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1021'
X-Git-Tag: tor-0.4.1.1-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39a14421b1f50b4bea8c42e4f76a67b648bfa8e0;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1021'

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

39a14421b1f50b4bea8c42e4f76a67b648bfa8e0