From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 Sep 2017 18:40:36 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.0
X-Git-Tag: tor-0.3.0.12~16^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23c5259a384b435c76b5cae40f68f07aec34d241;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" to avoid version bump.
---

23c5259a384b435c76b5cae40f68f07aec34d241