From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Jun 2018 17:07:13 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f389dadd02e9a234ee1d1c316cdb6dcc2b25489;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

1f389dadd02e9a234ee1d1c316cdb6dcc2b25489