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

Merge branch 'maint-0.3.5'
---

d612f7d9508e4233c9e49c077f27b0393a00508e