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

Merge branch 'maint-0.3.4'
---

5cb45d2c7a845cb27c7afc0734e33b1f1b2497f4