From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 May 2019 12:10:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.4
X-Git-Tag: tor-0.4.1.1-alpha~4^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaint-0.3.4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.4
---

a521c427883697fcfa027ffd72bb38f3aee5aceb