From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jul 2018 13:24:14 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.4-rc~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afee785417cba083c4914fd9b6db49498c2eb241;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid version bump
---

afee785417cba083c4914fd9b6db49498c2eb241