From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Sep 2018 13:41:55 +0000 (-0400)
Subject: Merge branch 'maint-0.3.2' into maint-0.3.3
X-Git-Tag: tor-0.3.3.11~43^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cfca28be28f36eec93195f8818ab7adc20426d1;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid version bump.
---

8cfca28be28f36eec93195f8818ab7adc20426d1