From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Oct 2018 17:02:23 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.3-alpha~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1891068f1cd1513e8ffba0be6d5ca7050f5e689;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

b1891068f1cd1513e8ffba0be6d5ca7050f5e689