From: George Kadianakis <desnacked@riseup.net>
Date: Mon, 19 Aug 2019 15:04:35 +0000 (+0300)
Subject: Merge branch 'tor-github/pr/1214'
X-Git-Tag: tor-0.4.2.1-alpha~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfc8c0b536aedc47f965efd47f180aaf6f5023e1;p=thirdparty%2Ftor.git

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

dfc8c0b536aedc47f965efd47f180aaf6f5023e1