From: teor <teor@torproject.org>
Date: Thu, 5 Sep 2019 04:47:54 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=896a1ac50b6ab182c1e15cc5271d0b24fcb90a31;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.0
---

896a1ac50b6ab182c1e15cc5271d0b24fcb90a31