From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 May 2019 12:10:17 +0000 (-0400)
Subject: Merge branch 'maint-0.4.0'
X-Git-Tag: tor-0.4.1.1-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cec7a7b5c6a947642ae81942f68e96fa403fc9f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0'
---

9cec7a7b5c6a947642ae81942f68e96fa403fc9f