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

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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

2f6be06f6a0a563bc07c089bf498b1d3792ae01f