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

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

fbf93614c9d42ff6bcd7b1252ad9f9e6ba2f890c