From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Jul 2018 17:38:47 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~270
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9628c0c0b2cc5c0286c4e49591b3b18dc054e87;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

a9628c0c0b2cc5c0286c4e49591b3b18dc054e87