From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Sep 2018 19:12:27 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.8~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d5aaef465f782d46f538b03fd962ba7007fca11;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid bump.
---

0d5aaef465f782d46f538b03fd962ba7007fca11