From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Aug 2018 12:47:26 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5980cb8a19e87b6d8b471de55eb659004fa97b59;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

5980cb8a19e87b6d8b471de55eb659004fa97b59