From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 4 Jan 2019 19:57:06 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9c783098256add3e72fe0ead41a9f9afd903551;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

a9c783098256add3e72fe0ead41a9f9afd903551