From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Sep 2018 13:42:22 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.9~37^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a343ecec55b47f5ff6dcf5ee61ad6d3e1796475;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump.
---

7a343ecec55b47f5ff6dcf5ee61ad6d3e1796475