From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 26 Jun 2018 13:21:59 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~362
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4e23dba930cbb8168151e1fe9dcf280615d6f3b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

b4e23dba930cbb8168151e1fe9dcf280615d6f3b