From: David Goulet <dgoulet@torproject.org>
Date: Wed, 20 Feb 2019 16:29:55 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/696'
X-Git-Tag: tor-0.4.1.1-alpha~214
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a30f17f72fb4e016f1c0d7f8619fcb20fec29d16;p=thirdparty%2Ftor.git

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

a30f17f72fb4e016f1c0d7f8619fcb20fec29d16