From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 24 Aug 2018 00:44:16 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=677048fe9fd04363f1709aa9df7596d70fe542d6;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

677048fe9fd04363f1709aa9df7596d70fe542d6