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

Merge branch 'maint-0.3.4'
---

da4f4cb269c3bc68c8e468e9fb704aecb8531238