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

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
this branch.
---

b74ed31f90ec43a7666cf622a6547d6d670e1692