From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Jun 2017 18:05:59 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.6
X-Git-Tag: tor-0.2.8.15~14^2^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb92d11f53dd2245f4cfd618bde3996e76b498cf;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.6

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

eb92d11f53dd2245f4cfd618bde3996e76b498cf