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

Merge branch 'maint-0.3.5'
---

31cc0d2c0bce11dbddec9e5869fdb2ce1acc001d