From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 Apr 2018 19:41:10 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.4.1-alpha~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8da7fcccd67f5dc37acc904f628d94fb2827059d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'

"ours" to avoid version bump.
---

8da7fcccd67f5dc37acc904f628d94fb2827059d