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

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.
---

42e12a3537fef04ab77defd6cb5581add439de43