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

Merge branch 'maint-0.3.4'
---

64af15d3737921b025a3902acb1dc6b674eb966c