From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Sep 2018 13:56:19 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f618094d25db35436a1e6962f4f8393d6470a08;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

2f618094d25db35436a1e6962f4f8393d6470a08