From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Aug 2018 13:39:08 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542