From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Oct 2018 16:52:54 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.3-alpha~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11161395aff57c5aa69cda916f1ac166ee928387;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

11161395aff57c5aa69cda916f1ac166ee928387