From: David Goulet <dgoulet@torproject.org>
Date: Tue, 30 Oct 2018 15:37:44 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=124c43704c99a181001d471b8cb2071e66b42597;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

124c43704c99a181001d471b8cb2071e66b42597