From: George Kadianakis <desnacked@riseup.net>
Date: Wed, 29 May 2019 18:28:04 +0000 (+0300)
Subject: Merge branch 'tor-github/pr/1032'
X-Git-Tag: tor-0.4.1.2-alpha~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8bd98b2fde088d7e277854ceeb69e0a2ba080de;p=thirdparty%2Ftor.git

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

d8bd98b2fde088d7e277854ceeb69e0a2ba080de