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

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

c29f05b159ae51472cd2a183a36cb9d352c082e5