From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 27 Jun 2017 15:04:44 +0000 (-0400)
Subject: Merge branch 'maint-0.2.7-redux' into maint-0.2.8
X-Git-Tag: tor-0.2.8.15~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3483f7c00349be6cba7b703f2e5ee94563d0c6eb;p=thirdparty%2Ftor.git

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

3483f7c00349be6cba7b703f2e5ee94563d0c6eb