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

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

9a0fd2dbb187e898f63064c483776538a90562f1