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

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump.
---

d7ad6d924ed12f54e2b61d2013046389673cd8ae