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

Merge branch 'maint-0.3.5'
---

bb9044381e6e32fab1708c3e9420a4090b2509de