From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 24 Sep 2018 15:10:56 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.3-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=112e5fa7ec6c8416d506e7572974e206f09cb9b0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

112e5fa7ec6c8416d506e7572974e206f09cb9b0