From: David Goulet <dgoulet@torproject.org>
Date: Tue, 4 Dec 2018 17:55:02 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8506dcdeb70279fd9c40e0d7b39d8a6dfed83085;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

8506dcdeb70279fd9c40e0d7b39d8a6dfed83085