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

Merge branch 'maint-0.3.5'
---

12175987fc744f5ca6559a821867631457911451