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

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

60adebc4996797de4c179f489d840af9feff60e2