From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Jun 2018 20:37:39 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~395
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=398f15bdf174c8b480b2d8984562f8360cbd2dda;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

398f15bdf174c8b480b2d8984562f8360cbd2dda