From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Dec 2018 14:41:05 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27e42699296c1a024db294a77ebb1c0c0bbbd179;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

27e42699296c1a024db294a77ebb1c0c0bbbd179