From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 3 Mar 2018 16:34:02 +0000 (-0500)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.4.1-alpha~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27c3a1d65740bd1fe85d7fb0cd401708dcf3a457;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'

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

27c3a1d65740bd1fe85d7fb0cd401708dcf3a457