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

Merge branch 'maint-0.3.4'
---

b7fbd1f3297d548b16a18bbc7a5636c80fff70de