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

Merge branch 'maint-0.3.5'
---

c5a216fe1bf2dc19fbe71680a78b98c51e7db190