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

Merge branch 'maint-0.3.5'
---

98a1b8770cc6a52cd958d49882dbbadd6ae212f0