From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 28 Feb 2017 15:26:45 +0000 (-0500)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7-redux
X-Git-Tag: tor-0.2.7.7~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1174b50cab48be08b321deced0cfa022160d2c40;p=thirdparty%2Ftor.git

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

"ours" merge to avoid version bumps
---

1174b50cab48be08b321deced0cfa022160d2c40