From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 4 Jan 2019 19:36:02 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94cab0d0bb3cce4a3f7f27cc169e5e5c1cb5c830;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

94cab0d0bb3cce4a3f7f27cc169e5e5c1cb5c830