From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Nov 2018 18:10:38 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56f24889a2ce1cb6256e35b788eb2942d720cbde;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

56f24889a2ce1cb6256e35b788eb2942d720cbde