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

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

c362c6a852d0c7a08d7abb28450a21975e42f55e