From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Jun 2018 16:05:18 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.5.0-alpha-dev~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=147c67d81dd52c4b09546b69992c0633f4007649;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'

"ours" to avoid version bump.
---

147c67d81dd52c4b09546b69992c0633f4007649