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

Merge branch 'maint-0.3.5'
---

bcba6a4918b43863d2ac70833aff6128231d5f22