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

Merge branch 'maint-0.3.4'
---

2e5eb029282696f68267cd106235b854f79771ed