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

Merge branch 'maint-0.3.4'
---

1de722d7a911d0814078d7b370bc536e4db8f37c