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

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

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.
---

f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06