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

Merge branch 'maint-0.3.4'
---

a23c36ebcd6af162fb08999f458faf98571eecbf