From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 29 Mar 2018 15:24:13 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.4.1-alpha~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e8cf876e7fb6a742a8d188c4d29baaeab2f63fe;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump.
---

5e8cf876e7fb6a742a8d188c4d29baaeab2f63fe