From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 14 Nov 2018 12:55:07 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3deb01e1a4209fabd6313acc273765ab02f481cf;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

3deb01e1a4209fabd6313acc273765ab02f481cf