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

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

19e19c1fa8d138b36b115a6cf5e1993df08c3df3