From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Sep 2018 19:11:49 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.2
X-Git-Tag: tor-0.3.2.12~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid bump
---

36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0