From: George Kadianakis <desnacked@riseup.net>
Date: Thu, 5 Sep 2019 14:10:07 +0000 (+0300)
Subject: Merge branch 'tor-github/pr/1293'
X-Git-Tag: tor-0.4.2.1-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb56b4c2bffe5d1d752694901b1853d89e3fb8cc;p=thirdparty%2Ftor.git

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

fb56b4c2bffe5d1d752694901b1853d89e3fb8cc