From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Jun 2017 13:29:23 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.0
X-Git-Tag: tor-0.3.0.8~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d389480da54dfff4900b5ddf8c0795a02672bafe;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump.
---

d389480da54dfff4900b5ddf8c0795a02672bafe