From: David Goulet <dgoulet@torproject.org>
Date: Tue, 12 Feb 2019 18:04:25 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/690'
X-Git-Tag: tor-0.4.1.0-alpha-dev~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c320c52e89d0d950f0316d2c2f070f7adca66c80;p=thirdparty%2Ftor.git

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

c320c52e89d0d950f0316d2c2f070f7adca66c80