From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 10 Apr 2019 15:31:44 +0000 (-0400)
Subject: Merge branch 'maint-0.4.0'
X-Git-Tag: tor-0.4.1.1-alpha~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3be1e26b8d27b9baa89549fff56fadd2894ec00f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0'
---

3be1e26b8d27b9baa89549fff56fadd2894ec00f