From: David Goulet <dgoulet@torproject.org>
Date: Mon, 26 Nov 2018 19:59:24 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b9a907bdccc588203d2110866d4e7bb72a25773;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

2b9a907bdccc588203d2110866d4e7bb72a25773