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

Merge branch 'maint-0.3.4'
---

7787150521fda0370331dab80d043294e05e1598