From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Nov 2018 21:47:25 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=066d257674524bd1ab97cdea9a1c32beabfd527c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

066d257674524bd1ab97cdea9a1c32beabfd527c