From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Sep 2018 19:53:06 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=902b34a0debeee92cb5844ec87c55db9f447562b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

902b34a0debeee92cb5844ec87c55db9f447562b