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

Merge branch 'maint-0.3.5'
---

be88f12b7f6b86cd44f155bb841f943d6af1f1d7