From: George Kadianakis <desnacked@riseup.net>
Date: Tue, 27 Aug 2019 08:47:46 +0000 (+0300)
Subject: Merge branch 'tor-github/pr/1267'
X-Git-Tag: tor-0.4.2.1-alpha~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78e084a12e55cf7f26f8663dfe738c2a49468e86;p=thirdparty%2Ftor.git

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

78e084a12e55cf7f26f8663dfe738c2a49468e86