From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Jul 2018 12:32:00 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b44fce67163cadbb951005416808b9b217c67639;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

b44fce67163cadbb951005416808b9b217c67639