From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Feb 2019 18:23:22 +0000 (-0500)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.4.1.1-alpha~45^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df70c44960aec3abc617b4d395bf5443c543cedc;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump
---

df70c44960aec3abc617b4d395bf5443c543cedc