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

Merge branch 'maint-0.3.5'
---

7e969a7b2d3f5fa1de3d064783a5134b06e79652