From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 May 2018 16:40:40 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.4.2-alpha~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=740b8bb79c6d4ca6bf5c860c319b71fb81840334;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump
---

740b8bb79c6d4ca6bf5c860c319b71fb81840334