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

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

3f2d1f7f0730a17b81d2fb94df9b6a5b8b277893