From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Sep 2018 12:33:13 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.2-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52191064acbddabf979c5f3b3f0813c105ce82f3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

52191064acbddabf979c5f3b3f0813c105ce82f3