From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 8 May 2017 12:07:11 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7-redux
X-Git-Tag: tor-0.2.7.8~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71dd1d716ac83d98ab4592f46b984338a1a7685b;p=thirdparty%2Ftor.git

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

71dd1d716ac83d98ab4592f46b984338a1a7685b