From: George Kadianakis <desnacked@riseup.net>
Date: Thu, 14 Feb 2019 15:39:34 +0000 (+0200)
Subject: Merge branch 'tor-github/pr/536' into maint-0.3.5
X-Git-Tag: tor-0.4.1.0-alpha-dev~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bfe4ed6dd666bb276e35b6e5c8c3de0c218bce0;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/536' into maint-0.3.5
---

9bfe4ed6dd666bb276e35b6e5c8c3de0c218bce0