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

Merge branch 'maint-0.3.4'
---

f36b3faa754fd7c704fe9240bc1599c6311b5309