From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Jul 2017 14:51:28 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7-redux
X-Git-Tag: tor-0.2.8.15~10^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5472066cd21099d406e69ef810b83c153bd21e5b;p=thirdparty%2Ftor.git

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

5472066cd21099d406e69ef810b83c153bd21e5b