From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Jun 2018 12:59:58 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~387
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c42071f7503897a8ccdcffabb6bdcff427d77d5e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

c42071f7503897a8ccdcffabb6bdcff427d77d5e