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

Merge branch 'maint-0.3.4'
---

af97879446b025c91ec6f27ae463a9e656806a08