From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Sep 2018 12:45:10 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e91eb83d84b2fd3992c3c4bba49ffd0acb5db08;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

7e91eb83d84b2fd3992c3c4bba49ffd0acb5db08