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

Merge branch 'maint-0.3.4'
---

50ad2545ccbec62f922306609384d78b781e4258