From: George Kadianakis <desnacked@riseup.net>
Date: Wed, 11 Sep 2019 13:19:21 +0000 (+0300)
Subject: Merge branch 'tor-github/pr/1307'
X-Git-Tag: tor-0.4.2.1-alpha~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b32f2508ca320e63956a3bb746729e1a4fb0190;p=thirdparty%2Ftor.git

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

3b32f2508ca320e63956a3bb746729e1a4fb0190